[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1532
Date       : Tue Jul 25 17:21:40 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/exjpeg.cpp
   M /Trunk/XaraLX/Kernel/impexpop.cpp

Fix the issues with exporting bitmap gallery items


Diff:
Index: Trunk/XaraLX/Kernel/exjpeg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/exjpeg.cpp	(revision 1531)
+++ Trunk/XaraLX/Kernel/exjpeg.cpp	(revision 1532)
@@ -1359,7 +1359,15 @@
 			}
 
 #if !defined(__WXMSW__) && defined(BIG_ENDIAN)
+			// Component swapping must be done out-of-line, to stop original
+			// being blatted
 			RGBTRIPLE* pExportRGB = (RGBTRIPLE*)pExportLine;
+			if( pExportLine == pBitmapLine )
+			{
+				pExportRGB = (RGBTRIPLE*)alloca( ExportlineSize );
+				memcpy( pExportRGB, pExportLine, ExportlineSize );
+				pExportLine = PBYTE(pExportRGB);
+			}
 			for( unsigned ord = 0; ord < Width; ++ord, ++ pExportRGB )
 				std::swap( pExportRGB->rgbtBlue, pExportRGB->rgbtRed );
 #endif
Index: Trunk/XaraLX/Kernel/impexpop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1531)
+++ Trunk/XaraLX/Kernel/impexpop.cpp	(revision 1532)
@@ -925,7 +925,7 @@
 		if (OriginalSourcePresent)
 		{
 			DefaultBitmapFilterID = FILTERID_EXPORT_JPEG;
-			SelectedBitmapFilter = 13; //FILTER_JPEG;
+			SelectedBitmapFilter = 0; //FILTER_JPEG;
 		}
 		else
 		{


Xara