[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 867
Date       : Sat Apr 22 20:47:01 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/Kernel/exjpeg.cpp
   M /Trunk/XaraLX/tools/textops.cpp
   M /Trunk/XaraLX/wxOil/filedlgs.h
   M /Trunk/XaraLX/wxOil/outptgif.h

A couple of warning fixes, and some type fixes from normalize.pl


Diff:
Index: Trunk/XaraLX/tools/textops.cpp
===================================================================
--- Trunk/XaraLX/tools/textops.cpp	(revision 866)
+++ Trunk/XaraLX/tools/textops.cpp	(revision 867)
@@ -50,7 +50,7 @@
 SCOPE OF LICENSE
 ----------------
 
-This license applies to this program () and its constituent source
+This license applies to this program (XaraLX) and its constituent source
 files only, and does not necessarily apply to other Xara products which may
 in part share the same code base, and are subject to their own licensing
 terms.
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 866)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 867)
@@ -517,8 +517,8 @@
 		}
 		case PNG: 
 		{
-			PNGExportOptions* pPNGOptions = (PNGExportOptions*)m_pExportOptions;
-			ERROR3IF(!pPNGOptions->IS_KIND_OF(PNGExportOptions), "pPNGOptions isn't");
+//			PNGExportOptions* pPNGOptions = (PNGExportOptions*)m_pExportOptions;
+//			ERROR3IF(!pPNGOptions->IS_KIND_OF(PNGExportOptions), "pPNGOptions isn't");
 			// 1, 4, 8, 24 and 32 bpp
 //			m_bTransparent = pPNGOptions->WantTransparent();
 
Index: Trunk/XaraLX/Kernel/exjpeg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/exjpeg.cpp	(revision 866)
+++ Trunk/XaraLX/Kernel/exjpeg.cpp	(revision 867)
@@ -1066,8 +1066,8 @@
 
 	BOOL Ok = TRUE;
 
-	JPEGExportOptions* pJPEGOptions = (JPEGExportOptions*)pOptions;
-	ERROR3IF(!pJPEGOptions->IS_KIND_OF(JPEGExportOptions), "pJPEGOptions isn't");
+//	JPEGExportOptions* pJPEGOptions = (JPEGExportOptions*)pOptions;
+//	ERROR3IF(!pJPEGOptions->IS_KIND_OF(JPEGExportOptions), "pJPEGOptions isn't");
 
 	OpDescriptor* pOpDes = OpDescriptor::FindOpDescriptor(OPTOKEN_GIFTABDLG);
 	if (pOpDes != NULL)
Index: Trunk/XaraLX/wxOil/outptgif.h
===================================================================
--- Trunk/XaraLX/wxOil/outptgif.h	(revision 866)
+++ Trunk/XaraLX/wxOil/outptgif.h	(revision 867)
@@ -120,10 +120,10 @@
 #define MAX_LWZ_BITS	12
 #define HSIZE  			5003            // 80% occupancy
 
-typedef int			code_int;
-typedef long int	count_int;
+typedef INT32	code_int;
+typedef INT32	count_int;
 
-const int maxbits = GIFBITS;            				// user settable max # bits/code
+const INT32 maxbits = GIFBITS;            				// user settable max # bits/code
 const code_int maxmaxcode = (code_int)1 << GIFBITS; 	// should NEVER generate this code
 
 const code_int hsize = HSIZE;              		// for dynamic table sizing
Index: Trunk/XaraLX/wxOil/filedlgs.h
===================================================================
--- Trunk/XaraLX/wxOil/filedlgs.h	(revision 866)
+++ Trunk/XaraLX/wxOil/filedlgs.h	(revision 867)
@@ -196,7 +196,7 @@
 
 #ifdef XPDialog
 // needed to show the "XP-style" place bar on the left hand side of the File dialogs:
-	virtual int ShowModal();
+	virtual int /*TYPENOTE: Correct*/ ShowModal();
 #endif
 
 //	WEBSTER-ranbirr-27/03/97


Xara