[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1336
Date       : Sat Jun 17 17:18:43 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/ai_epsrr.cpp
   M /Trunk/XaraLX/Kernel/ai_epsrr.h
   M /Trunk/XaraLX/Kernel/ccfile.cpp
   M /Trunk/XaraLX/Kernel/nativeps.cpp
   M /Trunk/XaraLX/Kernel/saveeps.cpp
   M /Trunk/XaraLX/Kernel/view.cpp

Fix some more EPS buggettes


Diff:
Index: Trunk/XaraLX/Kernel/saveeps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/saveeps.cpp	(revision 1335)
+++ Trunk/XaraLX/Kernel/saveeps.cpp	(revision 1336)
@@ -222,7 +222,7 @@
 //	CurrentRenderState = pSpread->FindFirstForExport(this, FALSE);
 
 	// Get a pointer to the CCDiskFile object
-	EPSExportDC* pEPSDC = (EPSExportDC*) pDC;
+	EPSExportDC* pEPSDC = (EPSExportDC*) CCDC::ConvertFromNativeDC(pDC);
 	ExportFile = pEPSDC->ExportFile;
 
 	// All okey dokey
Index: Trunk/XaraLX/Kernel/view.cpp
===================================================================
--- Trunk/XaraLX/Kernel/view.cpp	(revision 1335)
+++ Trunk/XaraLX/Kernel/view.cpp	(revision 1336)
@@ -154,8 +154,8 @@
 #define new CAM_DEBUG_NEW
 
 #ifdef _DEBUG
-//	#define _DEBUG_ATTACH_OPTIMAL_BITMAP
-//	#define _DEBUG_ATTACH_OPTIMAL_MASK
+	#define _DEBUG_ATTACH_OPTIMAL_BITMAP
+	#define _DEBUG_ATTACH_OPTIMAL_MASK
 #endif
 
 //-----------------------------------------------------------------------------------------//
Index: Trunk/XaraLX/Kernel/ccfile.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ccfile.cpp	(revision 1335)
+++ Trunk/XaraLX/Kernel/ccfile.cpp	(revision 1336)
@@ -5871,7 +5871,7 @@
 
 /********************************************************************************************
 
->	CCFile& CCMemTextFile::write(const TCHAR& buf)
+>	CCFile& CCMemTextFile::write(const char& buf)
 
 	Author:		Mario_Shamtani (Xara Group Ltd) <camelotdev@xxxxxxxx>
 	Created:	6/9/93
Index: Trunk/XaraLX/Kernel/ai_epsrr.h
===================================================================
--- Trunk/XaraLX/Kernel/ai_epsrr.h	(revision 1335)
+++ Trunk/XaraLX/Kernel/ai_epsrr.h	(revision 1336)
@@ -105,8 +105,8 @@
 class NodeBevel;
 
 // Constants.
-const char	LinearGradient []	= "Linear Gradient";
-const char	RadialGradient []	= "Radial Gradient";
+const TCHAR	LinearGradient []	= _T("Linear Gradient");
+const TCHAR	RadialGradient []	= _T("Radial Gradient");
 const INT32	LinearFill			= 0;
 const INT32	RadialFill			= 1;
 
Index: Trunk/XaraLX/Kernel/ai_epsrr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ai_epsrr.cpp	(revision 1335)
+++ Trunk/XaraLX/Kernel/ai_epsrr.cpp	(revision 1336)
@@ -1902,7 +1902,7 @@
 			// And output them. I'm writing directly to the file because the OutputToken ()
 			// function introduces spaces between the values, which is not a good thing for
 			// the AI file format. This way, it's much happier. :)
-			if ( ExportFile->write ( Output, 6 ).fail () )
+			if ( !pDC->OutputTCHARAsChar ( Output, 6 ) )
 			{
 				// There's been a problem.
 				return FALSE;
@@ -1973,7 +1973,7 @@
 			// And output them. I'm writing directly to the file because the OutputToken ()
 			// function introduces spaces between the values, which is not a good thing for
 			// the AI file format. This way, it's much happier. :)
-			if ( ExportFile->write ( Output, 6 ).fail () )
+			if ( !pDC->OutputTCHARAsChar ( Output, 6 ) )
 			{
 				// There's been a problem.
 				return FALSE;
Index: Trunk/XaraLX/Kernel/nativeps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nativeps.cpp	(revision 1335)
+++ Trunk/XaraLX/Kernel/nativeps.cpp	(revision 1336)
@@ -2679,13 +2679,13 @@
 	//ExportFile.setMode(filebuf::binary);
 
 	// Output a character to mark the begining of the binary section
-	static TCHAR Begin = '>';
-	if (ExportFile->write(&Begin, 1).fail())
+	static TCHAR Begin = _T('>');
+	if (!OutputTCHARAsChar(&Begin, 1))
 		// Error
 		return -1;
 
 	// Output the line of binary data
-	if (ExportFile->write(Data, Length).fail())
+	if (!OutputDirect(Data, Length))
 	{
 		// Error
 		return -1;
@@ -2710,7 +2710,7 @@
 		// Output it however many times we need to
 		while (Padding > 0)
 		{
-			if (ExportFile->write(Buffer, 1).fail())
+			if (OutputTCHARAsChar(Buffer, 1))
 				// Error
 				return -1;
 
@@ -2720,8 +2720,8 @@
 	}
 
 	//output an end marker
-	static TCHAR End = '<';
-	if (ExportFile->write(&End, 1).fail())
+	static TCHAR End = _T('<');
+	if (!OutputTCHARAsChar(&End, 1))
 		// Error
 		return -1;
 		


Xara