[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1058
Date       : Mon May 15 17:10:34 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/maskfilt.cpp
   M /Trunk/XaraLX/wxOil/pngfiltr.cpp

Fill values for PNG and perform export


Diff:
Index: Trunk/XaraLX/wxOil/pngfiltr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/pngfiltr.cpp	(revision 1057)
+++ Trunk/XaraLX/wxOil/pngfiltr.cpp	(revision 1058)
@@ -493,8 +493,6 @@
 		// invoke the dialog
 		pOpDes->Invoke(&Param);
 
-PORTNOTE("BitmapPrevDlg", "Removed use of BitmapPrevDlg")
-#ifndef EXCLUDE_FROM_XARALX
 		// SMFIX
 		// we have brought the dlg up so get the options from the dlg as the graphic type may have changed
 		pOptions = BmapPrevDlg::m_pExportOptions;
@@ -502,7 +500,6 @@
 		// check for valid options
 		//  This may get messed up, so have to use the second line below.
 		Ok = BmapPrevDlg::m_bClickedOnExport;
-#endif
 	}
 	else
 	{	
Index: Trunk/XaraLX/wxOil/maskfilt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/maskfilt.cpp	(revision 1057)
+++ Trunk/XaraLX/wxOil/maskfilt.cpp	(revision 1058)
@@ -364,11 +364,10 @@
 ********************************************************************************************/
 BOOL MaskedFilterExportOptions::RetrieveDefaults()
 {
-PORTNOTE("BMPFilter", "Removed use of BmpExportOptions")
-#ifndef EXCLUDE_FROM_XARALX
 	if (!BitmapExportOptions::RetrieveDefaults())
 		return FALSE;
 
+#ifndef EXCLUDE_FROM_XARALX
 	UINT32 Dither = BMPFilter::GetDefaultExportDither();
 	ERROR2IF(Dither > 4, FALSE, "Dither Invalid");
 #else


Xara