projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied thread wakeup patch.
[wxWidgets.git]
/
src
/
mac
/
pnghand.cpp
diff --git
a/src/mac/pnghand.cpp
b/src/mac/pnghand.cpp
index 90b59669f0f9b09db8a669a73ea599adb3d5e940..1ebf612f17bd978188e9f4811e1780bc4f1d7bdb 100644
(file)
--- a/
src/mac/pnghand.cpp
+++ b/
src/mac/pnghand.cpp
@@
-31,7
+31,7
@@
# include <fstream>
#endif
# include <fstream>
#endif
-#ifndef __
WXMAC_X
__
+#ifndef __
DARWIN
__
# include <windows.h>
#endif
#include "wx/msgdlg.h"
# include <windows.h>
#endif
#include "wx/msgdlg.h"
@@
-39,6
+39,7
@@
#include "wx/bitmap.h"
#include "wx/mac/pnghand.h"
#include "wx/mac/pngread.h"
#include "wx/bitmap.h"
#include "wx/mac/pnghand.h"
#include "wx/mac/pngread.h"
+#include "wx/mac/private.h"
extern "C" {
#include "png.h"
extern "C" {
#include "png.h"
@@
-116,7
+117,7
@@
wxPNGReader::Create(int width, int height, int depth, int colortype)
if (lpbi)
{
if (lpbi)
{
- wxMacDestroyGWorld( lpbi ) ;
+ wxMacDestroyGWorld(
(GWorldPtr)
lpbi ) ;
}
lpbi = wxMacCreateGWorld( Width , Height , Depth);
if (lpbi)
}
lpbi = wxMacCreateGWorld( Width , Height , Depth);
if (lpbi)
@@
-135,7
+136,7
@@
wxPNGReader::~wxPNGReader ( )
{
delete[] RawImage ;
if (lpbi) {
{
delete[] RawImage ;
if (lpbi) {
- wxMacDestroyGWorld( lpbi ) ;
+ wxMacDestroyGWorld(
(GWorldPtr)
lpbi ) ;
}
delete m_palette;
}
}
delete m_palette;
}
@@
-258,7
+259,7
@@
wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct)
void wxPNGReader::NullData()
{
if (lpbi) {
void wxPNGReader::NullData()
{
if (lpbi) {
- wxMacDestroyGWorld( lpbi ) ;
+ wxMacDestroyGWorld(
(GWorldPtr)
lpbi ) ;
}
delete m_palette;
lpbi = NULL;
}
delete m_palette;
lpbi = NULL;
@@
-512,7
+513,7
@@
bool wxPNGReader::ReadFile(char * ImageFileName)
GetGWorld( &origPort , &origDevice ) ;
// ignore shapedc
GetGWorld( &origPort , &origDevice ) ;
// ignore shapedc
- SetGWorld( lpbi , NULL ) ;
+ SetGWorld(
(GWorldPtr)
lpbi , NULL ) ;
do
{
// (unsigned char *)iter.GetRow();
do
{
// (unsigned char *)iter.GetRow();
@@
-823,7
+824,7
@@
bool wxPNGReader::SaveXPM(char *filename, char *name)
if ( !GetPalette() )
return FALSE;
if ( !GetPalette() )
return FALSE;
- ofstream str(filename);
+
wxSTD
ofstream str(filename);
if ( str.bad() )
return FALSE;
if ( str.bad() )
return FALSE;