On Thu, Oct 18, 2012 at 11:42 AM, Armin Le Grand <[email protected]> wrote:
> Hi Damjan,
>
>
> On 17.10.2012 20:12, Damjan Jovanovic wrote:
>>
>> On Wed, Oct 17, 2012 at 10:29 AM, Armin Le Grand <[email protected]>
>> wrote:
>>>
>>> Hi,
>>>
>>>
> --snip--
>
>
>>
>> It's most definitely NOT fixed, even in revision 1399319:
>>
>> [ build CXX ] drawinglayer/source/texture/texture3d
>> /path/to/AOO/main/drawinglayer/source/texture/texture3d.cxx: In member
>> function 'sal_uInt8
>> drawinglayer::texture::GeoTexSvxBitmapEx::impGetTransparence(sal_Int32&,
>> sal_Int32&) const':
>> /path/to/AOO/main/drawinglayer/source/texture/texture3d.cxx:137:78:
>> error: call of overloaded 'Color(const BitmapColor&)' is ambiguous
>> /path/to/AOO/main/drawinglayer/source/texture/texture3d.cxx:137:78:
>> note: candidates are:
>> /path/to/AOO/main/solver/350/unxlngx6.pro/inc/tools/color.hxx:120:7:
>> note: Color::Color(ColorData)
>> /path/to/AOO/main/solver/350/unxlngx6.pro/inc/tools/color.hxx:113:23:
>> note: Color::Color(const Color&)
>> make: ***
>> [/path/to/AOO/main/solver/350/unxlngx6.pro/workdir/CxxObject/drawinglayer/source/texture/texture3d.o]
>> Error 1
>> dmake: Error code 2, while making 'all'
>
>
> Sorry, but I'm normally building on Win (as I mentioned) and there the error
> does not happen. I had no access to a linux box yesterday, but I started a
> fresh checkout&build on linux one hour ago.
>
>
>>
>>
>> Attached is a possible patch (texture3d.patch) which gets it to
>> compile successfully but I don't want to apply it because it could be
>> semantically wrong.
>
>
> Patches are automatically removed on the lists, as it seems.
>
Here they are in plain text then:
--snip--
Index: main/drawinglayer/source/texture/texture3d.cxx
===================================================================
--- main/drawinglayer/source/texture/texture3d.cxx (revision 1399340)
+++ main/drawinglayer/source/texture/texture3d.cxx (working copy)
@@ -134,7 +134,7 @@
{
const BitmapColor
aBitmapColor(mpReadBitmap->GetColor(rY, rX));
- if(maBitmapEx.GetTransparentColor() == Color(aBitmapColor))
+ if(maBitmapEx.GetTransparentColor() ==
Color((ColorData)aBitmapColor))
{
return 255;
}
--snip--
which could be simpler (combine it with your previous patch), if it's
even correct, and
--snip--
Index: main/svx/source/sdr/contact/objectcontacttools.cxx
===================================================================
--- main/svx/source/sdr/contact/objectcontacttools.cxx (revision 1399340)
+++ main/svx/source/sdr/contact/objectcontacttools.cxx (working copy)
@@ -77,18 +77,18 @@
return new
drawinglayer::processor2d::VclPixelProcessor2D(rViewInformation2D,
rTargetOutDev);
//}
#else
- static bool bTryTestCanvas(false);
-
- if(bTryTestCanvas)
- {
- // create test-cancas-Processor
- return new
drawinglayer::processor2d::canvasProcessor2D(rViewInformation2D,
rTargetOutDev);
- }
- else
- {
+// static bool bTryTestCanvas(false);
+//
+// if(bTryTestCanvas)
+// {
+// // create test-cancas-Processor
+// return new
drawinglayer::processor2d::canvasProcessor2D(rViewInformation2D,
rTargetOutDev);
+// }
+// else
+// {
// create Pixel Vcl-Processor
return new
drawinglayer::processor2d::VclPixelProcessor2D(rViewInformation2D,
rTargetOutDev);
- }
+// }
#endif
}
}
--snip--
Thank you and I appreciate your efforts
Damjan
