[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]

[XaraXtreme-commits] Commit Complete



Commit by  : alex
Repository : xara
Revision   : 817
Date       : Fri Apr 14 17:34:12 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmpexdoc.cpp
   M /Trunk/XaraLX/Kernel/bmpprefs.cpp
   M /Trunk/XaraLX/Kernel/impexpop.cpp
   M /Trunk/XaraLX/Kernel/ngitem.cpp
   M /Trunk/XaraLX/Kernel/ngsentry.cpp
   M /Trunk/XaraLX/Kernel/styles.cpp
   M /Trunk/XaraLX/Kernel/styles.h
   M /Trunk/XaraLX/Kernel/zdeflate.cpp
   M /Trunk/XaraLX/Kernel/zdftrees.cpp
   M /Trunk/XaraLX/wxOil/bmpfiltr.cpp
   M /Trunk/XaraLX/wxOil/pngfiltr.cpp

Fixed 64bit compilation and various warnings


Diff:
Index: Trunk/XaraLX/Kernel/zdftrees.cpp
===================================================================
--- Trunk/XaraLX/Kernel/zdftrees.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/zdftrees.cpp	(revision 817)
@@ -1277,7 +1277,7 @@
 				IN assertion: length <= 16 and value fits in length bits.
 
 ********************************************************************************************/
-/*
+#if 0
 void ZipDeflate::send_bits( DeflateState *s, INT32 value, INT32 length)
 {
 #ifdef DEBUG
@@ -1289,7 +1289,7 @@
      * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
      * unused bits in value.
      */
-/*    if (s->bi_valid > (INT32)Buf_size - length) {
+     if (s->bi_valid > (INT32)Buf_size - length) {
         s->bi_buf |= (value << s->bi_valid);
         put_short(s, s->bi_buf);
         s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
@@ -1298,7 +1298,8 @@
         s->bi_buf |= value << s->bi_valid;
         s->bi_valid += length;
     }
-} */
+} 
+#endif
 
 /********************************************************************************************
 
Index: Trunk/XaraLX/Kernel/bmpexdoc.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpexdoc.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/bmpexdoc.cpp	(revision 817)
@@ -214,7 +214,8 @@
 	if (pLineColAttr == NULL)
 		return(InitFailed());
 
-	((AttrFillGeometry*)pLineColAttr)->SetStartColour(&DocColour(COLOUR_NONE));
+	DocColour none(COLOUR_NONE);
+	((AttrFillGeometry*)pLineColAttr)->SetStartColour(&none);
 	pLineColAttr->AttachNode(pRectNode, FIRSTCHILD);
 #endif
 
Index: Trunk/XaraLX/Kernel/zdeflate.cpp
===================================================================
--- Trunk/XaraLX/Kernel/zdeflate.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/zdeflate.cpp	(revision 817)
@@ -996,7 +996,7 @@
 
 ********************************************************************************************/
 
-///* ========================================================================= */
+//* ========================================================================= */
 	/*
 	     Sets the destination stream as a complete copy of the source stream.  If
 	   the source stream is using an application-supplied history buffer, a new
@@ -1018,14 +1018,15 @@
 	   destination.
 	*/
 
-//INT32 ZipDeflate::Copy(ZStream *dest, ZStream *source)
-/*{
+#if 0
+INT32 ZipDeflate::Copy(ZStream *dest, ZStream *source)
+{
     if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
         return Z_STREAM_ERROR;
     }
     *dest = *source;
     return Z_STREAM_ERROR; /* to be implemented */
-/*#if 0
+#if 0
     dest->state = (struct internal_state FAR *)
         (*dest->zalloc)(1, sizeof(deflate_state));
     if (dest->state == Z_NULL) return Z_MEM_ERROR;
@@ -1033,7 +1034,8 @@
     *(dest->state) = *(source->state);
     return Z_OK;
 #endif
-}*/
+}
+#endif
 
 
 /********************************************************************************************
Index: Trunk/XaraLX/Kernel/styles.h
===================================================================
--- Trunk/XaraLX/Kernel/styles.h	(revision 816)
+++ Trunk/XaraLX/Kernel/styles.h	(revision 817)
@@ -332,7 +332,7 @@
 };
 
 
-extern const UINT32 XFILEREF_ERROR;
+extern const INT32 XFILEREF_ERROR;
 
 class RecordReferenceItem;
 class List;
Index: Trunk/XaraLX/Kernel/styles.cpp
===================================================================
--- Trunk/XaraLX/Kernel/styles.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/styles.cpp	(revision 817)
@@ -1806,7 +1806,7 @@
 
 
 
-const UINT32 XFILEREF_ERROR = 0L;
+const INT32 XFILEREF_ERROR = 0L;
 
 
 /********************************************************************************************
Index: Trunk/XaraLX/Kernel/ngsentry.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ngsentry.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/ngsentry.cpp	(revision 817)
@@ -798,7 +798,7 @@
 	}
 
 	// Write out each property in ascending index order.
-	for (INT32 i = 0; i < HowMany(); i++)
+	for (UINT32 i = 0; i < HowMany(); i++)
 	{
 		const BarDataType& bdt = Bar(i);
 		BYTE nCode = bdt.IsLive |
Index: Trunk/XaraLX/Kernel/bmpprefs.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmpprefs.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/bmpprefs.cpp	(revision 817)
@@ -213,25 +213,25 @@
 	See Also:	BaseBitmapFilter::CreateBitmapOptions()
 ********************************************************************************************/
 
-BitmapExportOptions::BitmapExportOptions()
-  :	m_SelectionType(SELECTION),			// BaseBitmapFilter uses these...
+BitmapExportOptions::BitmapExportOptions() :
+	m_SelectionType(SELECTION),			// BaseBitmapFilter uses these...
+	m_OutputSize(0, 0),					// And initialise the output size
+	m_PixelOutputSize(0, 0),
+	m_FilterID(INVALID),
+	m_pBmpDlgParam(0),
+	m_bSeparateLayerFiles(FALSE),
+	m_bTempFileFlag(FALSE),
+	m_NumColsInPalette(0),
+	m_UseSystemColours(FALSE),
+	m_fPutHTMLTagOnClipboard(ms_fPutHTMLTagOnClipboard), // default HTML to clipboard
+	m_bValid(FALSE),					// Always use this...
 	m_DPI(0),
 	m_Depth(0),
-	m_pBmpDlgParam(0),
 	m_TransparencyIndex(-1),			// WEBSTER - markn 5/2/97 - no transparent colour
 	m_DialogID(0),						// BmpPrefsDlg uses these...
-	m_FilterID(INVALID),
 	m_pFilterName(0),
-	m_bValid(FALSE),					// Always use this...
-	m_OutputSize(0, 0),					// And initialise the output size
 	m_bTempFileExported(FALSE),			// export preview uses this
-	m_PixelOutputSize(0, 0),
-	m_fPutHTMLTagOnClipboard(ms_fPutHTMLTagOnClipboard), // default HTML to clipboard
-	m_NumColsInPalette(0),
-	m_UseSystemColours(FALSE),
-	m_Antialiasing(MINIMISE_VISIBLE_AA),	// Always start with the highest quality option
-	m_bSeparateLayerFiles(FALSE),
-	m_bTempFileFlag(FALSE)
+	m_Antialiasing(MINIMISE_VISIBLE_AA)	// Always start with the highest quality option
 {
 	m_Palette.NumberOfColours = 0;
 	memset(&(m_Palette.Data), 0, sizeof(ExtendedPaletteEntry)*256);
@@ -270,25 +270,25 @@
 BitmapExportOptions::BitmapExportOptions(
 								const CDlgResID DialogID, 
 								const FilterType FilterID,
-								const StringBase* pFilterName)
-  :	m_SelectionType(SELECTION),			// BaseBitmapFilter uses these...
+								const StringBase* pFilterName) :
+	m_SelectionType(SELECTION),			// BaseBitmapFilter uses these...
+	m_OutputSize(0, 0),					// And initialise the output size
+	m_PixelOutputSize(0, 0),
+	m_FilterID(FilterID),
+	m_pBmpDlgParam(0),
+	m_bSeparateLayerFiles(FALSE),
+	m_bTempFileFlag(FALSE),
+	m_NumColsInPalette(0),
+	m_UseSystemColours(FALSE),
+	m_fPutHTMLTagOnClipboard(ms_fPutHTMLTagOnClipboard), // default HTML to clipboard
+	m_bValid(FALSE),					// Always use this...
 	m_DPI(0),
 	m_Depth(0),
-	m_pBmpDlgParam(0),
 	m_TransparencyIndex(-1),			// WEBsTER - markn 5/2/97 - no transparent colour
 	m_DialogID(DialogID),				// BmpPrefsDlg uses these...
-	m_FilterID(FilterID),
 	m_pFilterName(pFilterName),
-	m_bValid(FALSE),					// Always use this...
-	m_OutputSize(0, 0),					// And initialise the output size
 	m_bTempFileExported(FALSE),			// export preview uses this
-	m_PixelOutputSize(0, 0),
-	m_fPutHTMLTagOnClipboard(ms_fPutHTMLTagOnClipboard), // default HTML to clipboard
-	m_NumColsInPalette(0),
-	m_UseSystemColours(FALSE),
-	m_Antialiasing(MINIMISE_VISIBLE_AA),	// Always start with the highest quality option
-	m_bSeparateLayerFiles(FALSE),
-	m_bTempFileFlag(FALSE)
+	m_Antialiasing(MINIMISE_VISIBLE_AA)	// Always start with the highest quality option
 {
 	m_Palette.NumberOfColours = 0;
 	memset(&(m_Palette.Data), 0, sizeof(ExtendedPaletteEntry)*256);
@@ -502,7 +502,7 @@
 		m_Palette.NumberOfColours = 0;
 
 		INT32 i = 0;
-		for( i; i < 256; i++ )
+		for( i=0; i < 256; i++ )
 		{
 			m_Palette.Data[ i ].Red					= 0;
 			m_Palette.Data[ i ].Green				= 0;
@@ -519,7 +519,7 @@
 	INT32 i = 0;
 	INT32 Colours = m_Palette.NumberOfColours;
 	Colours = max( 256, Colours );
-	for( i; i < Colours; i++ )
+	for( i=0; i < Colours; i++ )
 	{
 		m_Palette.Data[ i ].Red					= ( pOther->m_Palette ).Data[ i ].Red;
 		m_Palette.Data[ i ].Green				= ( pOther->m_Palette ).Data[ i ].Green;
Index: Trunk/XaraLX/Kernel/impexpop.cpp
===================================================================
--- Trunk/XaraLX/Kernel/impexpop.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/impexpop.cpp	(revision 817)
@@ -2001,7 +2001,8 @@
 	Purpose:	Used to pass around lists of bitmaps.  Note that deleting the bitmap array
 				is the responsibility of the caller.
 ********************************************************************************************/
-BitmapExportParam::BitmapExportParam(UINT32 Count, KernelBitmap** pBitmap, BmpDlgParam* pParam) : OpParam((INT32)Count, (INT32)pBitmap)
+BitmapExportParam::BitmapExportParam(UINT32 Count, KernelBitmap** pBitmap, BmpDlgParam* pParam) :
+	OpParam((INT32)Count, (void *)pBitmap)
 {
 	ERROR3IF(Count==0, "Zero bitmap count, that's not right");
 	ERROR3IF(pBitmap==0, "0 bitmap array");
Index: Trunk/XaraLX/Kernel/ngitem.cpp
===================================================================
--- Trunk/XaraLX/Kernel/ngitem.cpp	(revision 816)
+++ Trunk/XaraLX/Kernel/ngitem.cpp	(revision 817)
@@ -953,7 +953,7 @@
 BOOL SGNameItem::IsABackBar()
 {
 	String_256 SubName = m_strName;
-	*(SubName + 7) = 0;
+	*(((TCHAR *)SubName) + 7) = 0;
 	return ( SubName ==  _T("BackBar") );
 }
 
Index: Trunk/XaraLX/wxOil/bmpfiltr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/bmpfiltr.cpp	(revision 816)
+++ Trunk/XaraLX/wxOil/bmpfiltr.cpp	(revision 817)
@@ -829,7 +829,7 @@
 	}
 
 	// Determine the filter type currently in use in Accusoft format
-	INT32 FilterID = BMP_UNCOMPRESSED;
+//	INT32 FilterID = BMP_UNCOMPRESSED;
 
 	// Sets the Accusoft filter type to the same specified value just in case
 	// we wish to use the Accusoft DLL to do some of the BMP saving for us 
@@ -853,7 +853,7 @@
 		if (pOpDes != NULL)
 		{
 			// set up the data for the export options dialog
-			OpParam Param((INT32)pOptions, (INT32)this);
+			OpParam Param((void *)pOptions, (void *)this);
 
 			// invoke the dialog
 			pOpDes->Invoke(&Param);
@@ -1132,7 +1132,7 @@
 		// First, get the size of the bitmap we are going to export not just the simple
 		// lpInfo->bmiHeader.biHeight as this might just be the height of the first
 		// strip to be exported. With the width we can use the old method.
-		const UINT32 OutputWidth = lpInfo->bmiHeader.biWidth;
+//		const UINT32 OutputWidth = lpInfo->bmiHeader.biWidth;
 		const UINT32 OutputHeight = (INT32)ExportRegion->GetFullRegionHeight();
 TRACEUSER( "Neville", _T("BMPFilter::WriteDataToFile Total output height = %d
"),OutputHeight);
 TRACEUSER( "Neville", _T("BMPFilter::WriteDataToFile height of 1st strip = %d
"),lpInfo->bmiHeader.biHeight);
@@ -1389,18 +1389,18 @@
 	CWxBitmap* pWBitmap = (CWxBitmap*)pOilBitmap;
 	LPBITMAPINFO Info = pWBitmap->BMInfo;
 	LPBYTE Bytes = pWBitmap->BMBytes;
-	UINT32 Bpp = pWBitmap->GetBPP();
 
 	// Now, save the data out showing the correct progress string
 	String_64 ProgressString(ExportingMsgID);
 	BOOL ok = FALSE;
 	// If the user has chosen a compressed BMP then we must use the Accusoft code,
 	// if it is present as the built in one cannot do RLE compression.
-	BOOL Compression = FALSE;
 	//WEBSTER-Martin-07/01/97
 #ifndef WEBSTER
 PORTNOTE("ExtFilt", "Removed use of external filters")
 #ifndef EXCLUDE_FROM_XARALX
+	BOOL Compression = FALSE;
+	UINT32 Bpp = pWBitmap->GetBPP();
 	if (
 		(DefaultExportCompression && (Bpp == 4)) ||
 		(DefaultExportCompression && (Bpp == 8))
@@ -1466,7 +1466,7 @@
 	CWxBitmap* pWBitmap = (CWxBitmap*)pOilBitmap;
 	LPBITMAPINFO Info = pWBitmap->BMInfo;
 	LPBYTE Bytes = pWBitmap->BMBytes;
-	UINT32 Bpp = pWBitmap->GetBPP();
+//	UINT32 Bpp = pWBitmap->GetBPP();
 
 	// Now, save the data out showing the correct progress string
 	BOOL ok = FALSE;
Index: Trunk/XaraLX/wxOil/pngfiltr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/pngfiltr.cpp	(revision 816)
+++ Trunk/XaraLX/wxOil/pngfiltr.cpp	(revision 817)
@@ -488,7 +488,7 @@
 	if (pOpDes != NULL)
 	{
 		// set up the data for the export options dialog
-		OpParam Param((INT32)pOptions, (INT32)this);
+		OpParam Param((void *)pOptions, (void *)this);
 
 		// invoke the dialog
 		pOpDes->Invoke(&Param);


Xara