[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 811
Date       : Thu Apr 13 15:41:53 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmpcomp.cpp
   M /Trunk/XaraLX/wxOil/giffiltr.cpp
   M /Trunk/XaraLX/wxOil/pngfiltr.cpp

Removed more conditionals to improve bitmap export


Diff:
Index: Trunk/XaraLX/Kernel/bmpcomp.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpcomp.cpp	(revision 810)
+++ Trunk/XaraLX/Kernel/bmpcomp.cpp	(revision 811)
@@ -1760,8 +1760,6 @@
 
 BOOL BitmapListComponent::WriteBitmapPropertiesRecord(KernelBitmap* pBitmap, BaseCamelotFilter *pFilter, INT32 BmpRef)
 {
-	PORTNOTETRACE("other","BitmapListComponent::WriteBitmapPropertiesRecord - do nothing");
-#ifndef EXCLUDE_FROM_XARALX
 	BOOL ok = TRUE;
 
 	// populate the record
@@ -1769,6 +1767,8 @@
 	if (pBitmap->GetInterpolation()) Flags |= 0x01;
 
 	// Find out whether we need to make an XPE record or not...
+PORTNOTE("other","KernelBitmap::GetXPEInfo removed")
+#ifndef EXCLUDE_FROM_XARALX
 	KernelBitmap* pMaster = NULL;
 	IXMLDOMDocumentPtr pEditList = NULL;
 	pBitmap->GetXPEInfo(pMaster, pEditList);
@@ -1814,6 +1814,7 @@
 			}
 		}
 	}
+#endif
 
 	// Fallback to the original BITMAP PROPERTIES record style
 	// Create an old style properties record
@@ -1835,9 +1836,6 @@
 	if (ok) ok = pFilter->Write(&Rec);
 
 	return ok;
-#else
-	return FALSE;
-#endif
 }
 
 
Index: Trunk/XaraLX/wxOil/pngfiltr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/pngfiltr.cpp	(revision 810)
+++ Trunk/XaraLX/wxOil/pngfiltr.cpp	(revision 811)
@@ -905,10 +905,6 @@
 							 BaseCamelotFilter* pFilter )
 {
 #ifdef DO_EXPORT
-#ifndef WIN32
-	Error::SetError( _R(IDE_BADFORMAT) );
-	return FALSE;
-#else
 	ERROR2IF(File==NULL,FALSE,"PNGFilter::WriteToFile File pointer is null");
 	ERROR2IF(Info==NULL,FALSE,"PNGFilter::WriteToFile BitmapInfo pointer is null");
 	ERROR2IF(Bits==NULL,FALSE,"PNGFilter::WriteToFile Bits pointer is null");
@@ -946,7 +942,6 @@
 
 	// er, we seem to have finished OK so say so
 	return TRUE;
-#endif
 #else
 	return FALSE;
 #endif
@@ -986,10 +981,6 @@
 							 String_64* ProgressString )
 {
 #ifdef DO_EXPORT
-#ifndef WIN32
-	Error::SetError( _R(IDE_BADFORMAT) );
-	return FALSE;
-#else
 	ERROR2IF(File==NULL,FALSE,"PNGFilter::WriteToFile File pointer is null");
 	ERROR2IF(Info==NULL,FALSE,"PNGFilter::WriteToFile BitmapInfo pointer is null");
 	ERROR2IF(Bits==NULL,FALSE,"PNGFilter::WriteToFile Bits pointer is null");
@@ -1076,7 +1067,6 @@
 
 	// er, we seem to have finished OK so say so
 	return TRUE;
-#endif
 #else
 	return FALSE;
 #endif
Index: Trunk/XaraLX/wxOil/giffiltr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/giffiltr.cpp	(revision 810)
+++ Trunk/XaraLX/wxOil/giffiltr.cpp	(revision 811)
@@ -2181,10 +2181,6 @@
 								BOOL Interlace, INT32 Transparent,
 								BaseCamelotFilter *pFilter )
 {
-#ifndef WIN32
-	Error::SetError( _R(IDE_BADFORMAT) );
-	return FALSE;
-#else
 	ERROR2IF(File==NULL,FALSE,"TI_GIFFilter::WriteToFile File pointer is null");
 	ERROR2IF(Info==NULL,FALSE,"TI_GIFFilter::WriteToFile BitmapInfo pointer is null");
 	ERROR2IF(Bits==NULL,FALSE,"TI_GIFFilter::WriteToFile Bits pointer is null");
@@ -2215,7 +2211,6 @@
 	DestGIF.TidyUp();
 	
 	return ok;
-#endif
 }
 
 /********************************************************************************************
@@ -2252,10 +2247,6 @@
 BOOL TI_GIFFilter::WriteToFile( CCLexFile *File, LPBITMAPINFO Info, LPBYTE Bits,
 							    String_64 *ProgressString)
 {
-#ifndef WIN32
-	Error::SetError( _R(IDE_BADFORMAT) );
-	return FALSE;
-#else
 	ERROR2IF(File==NULL,FALSE,"TI_GIFFilter::WriteToFile File pointer is null");
 	ERROR2IF(Info==NULL,FALSE,"TI_GIFFilter::WriteToFile BitmapInfo pointer is null");
 	ERROR2IF(Bits==NULL,FALSE,"TI_GIFFilter::WriteToFile Bits pointer is null");
@@ -2299,7 +2290,7 @@
 			MakeTransparent = TRUE;
 			break;
 	}
-TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile FilterType = %d
"),FilterID);
+TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile FilterType = %d
"),s_FilterType);
 TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile Interlace = %d
"),Interlace);
 TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile Transparent = %d
"),Transparent);
 
@@ -2333,7 +2324,7 @@
 			MakeTransparent = FALSE;
 	}
 
-TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile FilterType = %d
"),FilterID);
+TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile FilterType = %d
"),s_FilterType);
 TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile Interlace = %d
"),Interlace);
 TRACEUSER( "Neville", _T("TI_GIFFilter::WriteToFile Transparent = %d
"),Transparent);
 
@@ -2367,7 +2358,6 @@
 		EndSlowJob();
 
 	return ok;
-#endif
 }
 
 


Xara