[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1365
Date       : Sun Jun 25 21:29:02 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/psrndrgn.cpp
   M /Trunk/XaraLX/wxOil/grndprnt.cpp

Temporarily output text as curves to PS


Diff:
Index: Trunk/XaraLX/Kernel/psrndrgn.cpp
===================================================================
--- Trunk/XaraLX/Kernel/psrndrgn.cpp	(revision 1364)
+++ Trunk/XaraLX/Kernel/psrndrgn.cpp	(revision 1365)
@@ -1229,7 +1229,9 @@
 	// Finished doing GDI output
 	if (!pPSDC->EndOSOutput())
 		return FALSE;
-#endif
 	return TRUE;
+#else
+	return RenderRegion::RenderChar(ch, pMatrix);
+#endif	
 }
 
Index: Trunk/XaraLX/wxOil/grndprnt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/grndprnt.cpp	(revision 1364)
+++ Trunk/XaraLX/wxOil/grndprnt.cpp	(revision 1365)
@@ -437,6 +437,8 @@
 	{
 		// Not colour separating, but if it's a 32bpp bitmap, we need to convert to something 
 		// that StretchDIBits (below) can understand
+PORTNOTE("printing", "Do not convert down BPP")
+#ifndef EXCLUDE_FROM_XARALX
 		if (uBitmapDepth == 32)
 		{
 			// Can't plot 32bpp bitmaps to GDI as 16-bit GDI doesn't understand them,
@@ -463,6 +465,7 @@
 			pBitmapInfo->bmiHeader.biBitCount  = 24;
 			pBitmapInfo->bmiHeader.biSizeImage = DestlineBytes * BitmapHeight;
 		}
+#endif
 	}
 
 	WinRect clip;


Xara