[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1298
Date       : Mon Jun 12 15:15:11 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/cameleps.cpp
   M /Trunk/XaraLX/Kernel/freeeps.cpp
   M /Trunk/XaraLX/Kernel/nativeps.cpp
   M /Trunk/XaraLX/Kernel/saveeps.cpp

Some compilation fixes (these files are not in the makefile yet)


Diff:
Index: Trunk/XaraLX/Kernel/freeeps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/freeeps.cpp	(revision 1297)
+++ Trunk/XaraLX/Kernel/freeeps.cpp	(revision 1298)
@@ -161,41 +161,41 @@
 CommandMap FreeHandEPSFilter::FHCommands[] =
 {
 	// colours
-	EPSC_Xa,		"Xa",
-	EPSC_xa,		"xa",
-	EPSC_Ka,		"Ka",
-	EPSC_ka,		"ka",
+	{ EPSC_Xa,		"Xa" },
+	{ EPSC_xa,		"xa" },
+	{ EPSC_Ka,		"Ka" },
+	{ EPSC_ka,		"ka" },
 
 	// fills
-	EPSC_radfill,	"radfill",
-	EPSC_recfill,	"recfill",
-	EPSC_load,		"load",
+	{ EPSC_radfill,	"radfill" },
+	{ EPSC_recfill,	"recfill" },
+	{ EPSC_load,	"load" },
 
 	// colour list stuff
-	EPSC_BeginSetup,"%%BeginSetup",
-	EPSC_def,		"def",
-	EPSC_newcmykcustomcolor, "newcmykcustomcolor",
+	{ EPSC_BeginSetup, "%%BeginSetup"},
+	{ EPSC_def,		"def" },
+	{ EPSC_newcmykcustomcolor, "newcmykcustomcolor" },
 
 	// text stuff
-	EPSC_makesetfont, "makesetfont",
-	EPSC_ts,		"ts",
-	EPSC_sts,		"sts",
+	{ EPSC_makesetfont, "makesetfont" },
+	{ EPSC_ts,		"ts" },
+	{ EPSC_sts,		"sts" },
 
 	// complex path stuff
-	EPSC_eomode,	"eomode",
-	EPSC_true,		"true",
-	EPSC_false,		"false",
+	{ EPSC_eomode,	"eomode" },
+	{ EPSC_true,	"true" },
+	{ EPSC_false,	"false" },
 
 	// misc stuff
-	EPSC_concat,	"concat",
-	EPSC_vms,		"vms",
-	EPSC_vmr,		"vmr",
-	EPSC_vmrs,		"vmrs",
-	EPSC_stob,		"stob",
-	EPSC_fhsetspreadallow, "fhsetspreadallow",
+	{ EPSC_concat,	"concat" },
+	{ EPSC_vms,		"vms" },
+	{ EPSC_vmr,		"vmr" },
+	{ EPSC_vmrs,	"vmrs" },
+	{ EPSC_stob,	"stob" },
+	{ EPSC_fhsetspreadallow, "fhsetspreadallow" },
 
 	// Sentinel
-	EPSC_Invalid,	"Invalid"
+	{ EPSC_Invalid,	"Invalid" }
 };
 
 /********************************************************************************************
Index: Trunk/XaraLX/Kernel/saveeps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/saveeps.cpp	(revision 1297)
+++ Trunk/XaraLX/Kernel/saveeps.cpp	(revision 1298)
@@ -104,7 +104,7 @@
 #include "camtypes.h"
 #include "saveeps.h"
 
-#include <afxdlgs.h>
+//#include <afxdlgs.h>
 #include <ctype.h>
 #include <time.h>
 
@@ -120,7 +120,7 @@
 //#include "tim.h"
 #include "kerneldc.h"
 //#include "spread.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-#include "userenv.h"
+//#include "userenv.h"
 //#include "doccomp.h" - in camtypes.h [AUTOMATICALLY REMOVED]
 #include "colourix.h"
 //#include "attrmgr.h" - in camtypes.h [AUTOMATICALLY REMOVED]
Index: Trunk/XaraLX/Kernel/nativeps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/nativeps.cpp	(revision 1297)
+++ Trunk/XaraLX/Kernel/nativeps.cpp	(revision 1298)
@@ -102,7 +102,7 @@
 
 #include "camtypes.h"
 //#include "app.h" - in camtypes.h [AUTOMATICALLY REMOVED]
-//#include "nativeps.h"
+#include "nativeps.h"
 //#include "filtrres.h"
 //#include "rik.h"
 //#include "tim.h"
@@ -117,7 +117,7 @@
 #include "nodetext.h"
 //#include "nev.h"
 #include "zstream.h"	// zipping stream class
-#include <strstream>
+#include <sstream>
 #include "fontman.h"
 #include "expbmp.h"
 //#include "spread.h" - in camtypes.h [AUTOMATICALLY REMOVED]
@@ -153,10 +153,10 @@
 CommandMap CamelotNativeEPSFilter::NativeCommands[] =
 {
 	// Bitmap Pool Tokens
-	EPSC_cbmp,		"cbmp",
+	{ EPSC_cbmp,		"cbmp" },
 
 	// Sentinel
-	EPSC_Invalid,	"Invalid"
+	{ EPSC_Invalid,	"Invalid" }
 };
 
 
@@ -298,9 +298,9 @@
 	FilterInfo.Load(FilterInfoID);
 
 	// Preference to turn native file compression on or off
-	if (Camelot.DeclareSection("Filters", 10))
+	if (Camelot.DeclareSection(_T("Filters"), 10))
 	{
-		Camelot.DeclarePref( NULL, "CompressNative", &CompressNative, 0, 1 );
+		Camelot.DeclarePref( NULL, _T("CompressNative"), &CompressNative, 0, 1 );
 	}
 
 	// All ok
@@ -321,7 +321,7 @@
 
 BOOL CamelotNativeEPSFilter::SetNativeCompression(BOOL NewState)
 {
-	BOOL OldState = CompressNative;
+//	BOOL OldState = CompressNative;
 	CompressNative = NewState;
 	return CompressNative;
 }
@@ -460,7 +460,7 @@
 
 			// Next thing will be a pool item
 			TRACEUSER( "Rik", _T("Got a Bitmap pool item....
"));
-			PendingBitmap = PENDING_BITMAP_POOLITEM;
+			m_PendingBitmap = PENDING_BITMAP_POOLITEM;
 			break;
 		}
 
@@ -714,7 +714,7 @@
 					break;
 
 				case TRANSPFILL_TEXTURE:
-					PendingBitmap = PENDING_BITMAP_TRANSPFILL;
+					m_PendingBitmap = PENDING_BITMAP_TRANSPFILL;
 					BitmapAttrs.Coords[0] = StartPoint;
 					BitmapAttrs.Coords[1] = EndPoint;
 					BitmapAttrs.Coords[2] = EndPoint2;
@@ -724,7 +724,7 @@
 					break;
 
 				case TRANSPFILL_NEWTEXTURE:
-					PendingBitmap = PENDING_BITMAP_TRANSPFILL;
+					m_PendingBitmap = PENDING_BITMAP_TRANSPFILL;
 					BitmapAttrs.Coords[0] = StartPoint;
 					BitmapAttrs.Coords[1] = EndPoint;
 					BitmapAttrs.Coords[2] = EndPoint2;
Index: Trunk/XaraLX/Kernel/cameleps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/cameleps.cpp	(revision 1297)
+++ Trunk/XaraLX/Kernel/cameleps.cpp	(revision 1298)
@@ -699,39 +699,39 @@
 
 			switch (ObjectID)
 			{
-				case TAG_FONTFLAGS:
+				case EOTAG_FONTFLAGS:
 				{
 					if (!ProcessFontFlags())
 						goto EPSError;
 				}
 				break;
 
-				case TAG_BITMAPFLAGS:
+				case EOTAG_BITMAPFLAGS:
 				{
 					if (!ProcessBitmapFlags())
 						goto EPSError;
 				}
 				break;
 
-				case TAG_TEXTWRAPPED:
+				case EOTAG_TEXTWRAPPED:
 				{
 					if (!FindEndOfTag())
 						goto EPSError;
 				}
 				break;
 
-				case TAG_FONTTYPE:
+				case EOTAG_FONTTYPE:
 				{
 					if (!ProcessFontType())
 						goto EPSError;
 				}
 				break;
 
-				case TAG_GUIDELAYER:
-				case TAG_GUIDELINE:
+				case EOTAG_GUIDELAYER:
+				case EOTAG_GUIDELINE:
 					break;
 
-				case TAG_MOULDTHRESHOLD:
+				case EOTAG_MOULDTHRESHOLD:
 				{
 					if (!ProcessMouldThreshold())
 						goto EPSError;


Xara