[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1635
Date       : Tue Aug  1 14:09:48 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/Kernel/bmpexprw.cpp

Fix and re-instate index background transparence support (BZ #1331)


Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1634)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1635)
@@ -3898,20 +3898,10 @@
 		SetStringGadgetValue(_R(IDC_OPTIONSTAB_CHECK2), _R(IDS_OPTIONS_TAB_TRANSPARENT));
 		SetStringGadgetValue(_R(IDC_OPTIONSTAB_CHECK3), _R(IDS_OPTIONS_TAB_LAYERFILES));
 		HideGadget(_R(IDC_OPTIONSTAB_CHECK1), FALSE);
-PORTNOTE("other","Transparent background just break palettised exports")
-#if defined(ENABLE_TRANSPARENT)
 		HideGadget(_R(IDC_OPTIONSTAB_CHECK2), FALSE);
-#else
-		HideGadget(_R(IDC_OPTIONSTAB_CHECK2), TRUE);
-#endif 
 		HideGadget(_R(IDC_OPTIONSTAB_CHECK3), FALSE);
 		SetLongGadgetValue(_R(IDC_OPTIONSTAB_CHECK1), ((MaskedFilterExportOptions*) m_pExportOptions)->WantInterlaced());
-#if defined(ENABLE_TRANSPARENT)
 		SetLongGadgetValue(_R(IDC_OPTIONSTAB_CHECK2), m_pExportOptions->IsBackgroundTransparent());
-#else
-		m_pExportOptions->SetBackgroundTransparency( FALSE );
-		SetLongGadgetValue(_R(IDC_OPTIONSTAB_CHECK2), FALSE);
-#endif
 		SetLongGadgetValue(_R(IDC_OPTIONSTAB_CHECK3), m_pExportOptions->GetSeparateLayerFiles());
 	}
 
Index: Trunk/XaraLX/Kernel/bmpexprw.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1634)
+++ Trunk/XaraLX/Kernel/bmpexprw.cpp	(revision 1635)
@@ -1693,11 +1693,6 @@
 	pNewOptions->RetrieveDefaults();
 	pNewOptions->CopyFrom(BitmapData[Index].m_pOptions);
 
-PORTNOTE("other","Transparent background just break palettised exports, stop the flag sneaking back in")
-#if !defined(ENABLE_TRANSPARENT)
-	pNewOptions->SetBackgroundTransparency( FALSE );
-#endif
-		
 	// Bodge fix so BMPs don't gain background transparency as they do not support it
 	if (FileTypeSelected.IsIdentical(String_16(_R(IDS_FILE_TYPE_BMP))))
 		pNewOptions->SetBackgroundTransparency(FALSE);


Xara