Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor changes for windows compilability

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Unknown (UG)
1998-10-25 01:48:51 +00:00
parent 3a5a2f56f2
commit 0b4f9ee3d0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/image.cpp
View File

@@ -11,6 +11,13 @@
#pragma implementation "image.h" #pragma implementation "image.h"
#endif #endif
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/image.h" #include "wx/image.h"
#include "wx/debug.h" #include "wx/debug.h"
#include "wx/log.h" #include "wx/log.h"
@@ -320,6 +327,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name )
unsigned char *ptr, **lines, *ptr2; unsigned char *ptr, **lines, *ptr2;
int transp,bit_depth,color_type,interlace_type; int transp,bit_depth,color_type,interlace_type;
png_uint_32 width, height; png_uint_32 width, height;
unsigned int i;
image->Destroy(); image->Destroy();
@@ -375,7 +383,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name )
return FALSE; return FALSE;
} }
for (unsigned int i = 0; i < height; i++) for (i = 0; i < height; i++)
{ {
if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL) if ((lines[i] = (unsigned char *)malloc(width * (sizeof(unsigned char) * 4))) == NULL)
{ {
@@ -444,7 +452,7 @@ bool wxPNGHandler::LoadFile( wxImage *image, const wxString& name )
} }
} }
} }
for (unsigned int i = 0; i < height; i++) free( lines[i] ); for (i = 0; i < height; i++) free( lines[i] );
free( lines ); free( lines );
if (transp) if (transp)
image->SetMaskColour( 255, 0, 255 ); image->SetMaskColour( 255, 0, 255 );
@@ -556,11 +564,12 @@ bool wxBMPHandler::LoadFile( wxImage *image, const wxString& name )
unsigned char r, g, b; unsigned char r, g, b;
} }
*cmap = NULL; *cmap = NULL;
#ifndef BI_RGB
#define BI_RGB 0 #define BI_RGB 0
#define BI_RLE8 1 #define BI_RLE8 1
#define BI_RLE4 2 #define BI_RLE4 2
#define BI_BITFIELDS 3 #define BI_BITFIELDS 3
#endif
image->Destroy(); image->Destroy();