Author: alg
Date: Tue Apr 9 09:37:28 2013
New Revision: 1465948
URL: http://svn.apache.org/r1465948
Log:
i113080 added test code (in debug mode), cleanedup a small inconsistency
Modified:
openoffice/trunk/main/drawinglayer/source/tools/converters.cxx
Modified: openoffice/trunk/main/drawinglayer/source/tools/converters.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/drawinglayer/source/tools/converters.cxx?rev=1465948&r1=1465947&r2=1465948&view=diff
==============================================================================
--- openoffice/trunk/main/drawinglayer/source/tools/converters.cxx (original)
+++ openoffice/trunk/main/drawinglayer/source/tools/converters.cxx Tue Apr 9
09:37:28 2013
@@ -49,6 +49,9 @@ namespace drawinglayer
sal_uInt32 nMaxQuadratPixels)
{
BitmapEx aRetval;
+#ifdef DBG_UTIL
+ static bool bDoSaveForVisualControl(false);
+#endif
if(rSeq.hasElements() && nDiscreteWidth && nDiscreteHeight)
{
@@ -81,13 +84,14 @@ namespace drawinglayer
// prepare vdev
maContent.SetOutputSizePixel(aSizePixel, false);
maContent.SetMapMode(aMapModePixel);
- maContent.SetAntialiasing(true);
// set to all white
maContent.SetBackground(Wallpaper(Color(COL_WHITE)));
maContent.Erase();
- // create pixel processor
+ // create pixel processor, also already takes care of AAing and
+ // checking the getOptionsDrawinglayer().IsAntiAliasing()
switch. If
+ // not wanted, change after this call as needed
processor2d::BaseProcessor2D* pContentProcessor =
processor2d::createPixelProcessor2DFromOutputDevice(
maContent,
aViewInformation2D);
@@ -101,21 +105,29 @@ namespace drawinglayer
maContent.EnableMapMode(false);
const Bitmap aContent(maContent.GetBitmap(aEmptyPoint,
aSizePixel));
+#ifdef DBG_UTIL
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew((const String&)String(ByteString(
"c:\\test_content.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
+ ::vcl::PNGWriter aPNGWriter(aContent);
+ aPNGWriter.Write(aNew);
+ }
+#endif
// prepare for mask creation
maContent.SetMapMode(aMapModePixel);
- maContent.SetAntialiasing(true);
// set alpha to all white (fully transparent)
maContent.Erase();
// embed primitives to paint them black
+ static basegfx::BColorModifyMode aMode =
basegfx::BCOLORMODIFYMODE_REPLACE;
const primitive2d::Primitive2DReference xRef(
new primitive2d::ModifiedColorPrimitive2D(
aSequence,
basegfx::BColorModifier(
basegfx::BColor(0.0, 0.0, 0.0),
0.5,
- basegfx::BCOLORMODIFYMODE_REPLACE)));
+ aMode)));
const primitive2d::Primitive2DSequence xSeq(&xRef, 1);
// render
@@ -124,22 +136,28 @@ namespace drawinglayer
// get alpha cahannel from vdev
maContent.EnableMapMode(false);
- const AlphaMask
aAlphaMask(maContent.GetBitmap(aEmptyPoint, aSizePixel));
+ const Bitmap aAlpha(maContent.GetBitmap(aEmptyPoint,
aSizePixel));
+#ifdef DBG_UTIL
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew((const String&)String(ByteString(
"c:\\test_alpha.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
+ ::vcl::PNGWriter aPNGWriter(aAlpha);
+ aPNGWriter.Write(aNew);
+ }
+#endif
// create BitmapEx result
- aRetval = BitmapEx(aContent, aAlphaMask);
- }
- }
-
+ aRetval = BitmapEx(aContent, AlphaMask(aAlpha));
#ifdef DBG_UTIL
- static bool bDoSaveForVisualControl(false);
- if(bDoSaveForVisualControl)
- {
- SvFileStream aNew((const String&)String(ByteString(
"c:\\test.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
- ::vcl::PNGWriter aPNGWriter(aRetval);
- aPNGWriter.Write(aNew);
- }
+ if(bDoSaveForVisualControl)
+ {
+ SvFileStream aNew((const String&)String(ByteString(
"c:\\test_combined.png" ), RTL_TEXTENCODING_UTF8), STREAM_WRITE|STREAM_TRUNC);
+ ::vcl::PNGWriter aPNGWriter(aRetval);
+ aPNGWriter.Write(aNew);
+ }
#endif
+ }
+ }
return aRetval;
}
