X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c551d959447b3aea01cc35f45aa4cacff2173ba..dc0e23b8fb35c8b0e527594f96fa91c57a067b3a:/src/mac/pnghand.cpp diff --git a/src/mac/pnghand.cpp b/src/mac/pnghand.cpp index 8d6d6544f5..3d2690803c 100644 --- a/src/mac/pnghand.cpp +++ b/src/mac/pnghand.cpp @@ -10,15 +10,15 @@ ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "pngread.h" -#pragma implementation "pnghand.h" +# pragma implementation "pngread.h" +# pragma implementation "pnghand.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop +# pragma hdrstop #endif #include @@ -31,11 +31,15 @@ # include #endif -#include -#include -#include -#include -#include +#ifndef __DARWIN__ +# include +#endif +#include "wx/msgdlg.h" +#include "wx/palette.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" @@ -47,7 +51,7 @@ extern "C" void png_write_init PNGARG((png_structp png_ptr)); extern CTabHandle wxMacCreateColorTable( int numColors ) ; extern void wxMacDestroyColorTable( CTabHandle colors ) ; extern void wxMacSetColorTableEntry( CTabHandle newColors , int index , int red , int green , int blue ) ; -extern GWorldPtr wxMacCreateGWorld( int height , int width , int depth ) ; +extern GWorldPtr wxMacCreateGWorld( int width , int height , int depth ) ; extern void wxMacDestroyGWorld( GWorldPtr gw ) ; void @@ -76,7 +80,7 @@ wxPNGReader::wxPNGReader(void) lpbi = NULL; bgindex = -1; - Palette = 0; + m_palette = 0; imageOK = FALSE; } @@ -88,7 +92,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName ) Width = 0; Height = 0; // Dimensions Depth = 0; // (bits x pixel) - ColorType = 0; // Bit 1 = Palette used + ColorType = 0; // Bit 1 = m_palette used // Bit 2 = Color used // Bit 3 = Alpha used @@ -96,7 +100,7 @@ wxPNGReader::wxPNGReader ( char* ImageFileName ) lpbi = NULL; bgindex = -1; - Palette = 0; + m_palette = 0; imageOK = ReadFile (ImageFileName); } @@ -106,16 +110,16 @@ wxPNGReader::Create(int width, int height, int depth, int colortype) { Width = width; Height = height; Depth = depth; ColorType = (colortype>=0) ? colortype: ((Depth>8) ? COLORTYPE_COLOR: 0); - delete Palette; - delete[] RawImage ; - RawImage = 0; - Palette = 0; + delete m_palette; + m_palette = NULL; + delete[] RawImage; + RawImage = NULL; - if (lpbi) - { - wxMacDestroyGWorld( lpbi ) ; + if (lpbi) { + wxMacDestroyGWorld( (GWorldPtr) lpbi ) ; } - if (lpbi = wxMacCreateGWorld( Width , Height , Depth) ) + lpbi = wxMacCreateGWorld( Width , Height , Depth); + if (lpbi) { EfeWidth = (long)(((long)Width*Depth + 31) / 32) * 4; int bitwidth = width ; @@ -129,11 +133,18 @@ wxPNGReader::Create(int width, int height, int depth, int colortype) wxPNGReader::~wxPNGReader ( ) { - delete[] RawImage ; - if (lpbi) { - wxMacDestroyGWorld( lpbi ) ; - } - delete Palette; + if (RawImage != NULL) { + delete[] RawImage ; + RawImage = NULL; + } + if (lpbi) { + wxMacDestroyGWorld( (GWorldPtr) lpbi ) ; + lpbi = NULL; + } + if (m_palette != NULL) { + delete m_palette; + m_palette = NULL; + } } @@ -150,10 +161,10 @@ bool wxPNGReader::GetRGB(int x, int y, byte* r, byte* g, byte* b) { if (!Inside(x, y)) return FALSE; - if (Palette) { - return Palette->GetRGB(GetIndex(x, y), r, g, b); + if (m_palette) { + return m_palette->GetRGB(GetIndex(x, y), r, g, b); /* PALETTEENTRY entry; - ::GetPaletteEntries((HPALETTE) Palette->GetHPALETTE(), GetIndex(x, y), 1, &entry); + ::GetPaletteEntries((HPALETTE) m_palette->GetHPALETTE(), GetIndex(x, y), 1, &entry); *r = entry.peRed; *g = entry.peGreen; *b = entry.peBlue; */ @@ -183,8 +194,8 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b) if (ColorType & COLORTYPE_PALETTE) { - if (!Palette) return FALSE; - SetIndex(x, y, Palette->GetPixel(r, g, b)); + if (!m_palette) return FALSE; + SetIndex(x, y, m_palette->GetPixel(r, g, b)); } else { ImagePointerType ImagePointer = RawImage + EfeWidth*y + (x*Depth >> 3); @@ -198,37 +209,37 @@ bool wxPNGReader::SetRGB(int x, int y, byte r, byte g, byte b) bool wxPNGReader::SetPalette(wxPalette* colourmap) { - delete Palette ; + delete m_palette ; if (!colourmap) return FALSE; ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR); - Palette = new wxPalette( *colourmap ); + m_palette = new wxPalette( *colourmap ); return true ; -// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); +// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0); } bool wxPNGReader::SetPalette(int n, byte *r, byte *g, byte *b) { - delete Palette ; - Palette = new wxPalette(); - if (!Palette) + delete m_palette ; + m_palette = new wxPalette(); + if (!m_palette) return FALSE; if (!g) g = r; if (!b) b = g; - Palette->Create(n, r, g, b); + m_palette->Create(n, r, g, b); ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR); return true ; -// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); +// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0); } bool wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct) { - delete Palette ; - Palette = new wxPalette(); - if (!Palette) + delete m_palette ; + m_palette = new wxPalette(); + if (!m_palette) return FALSE; byte r[256], g[256], b[256]; @@ -245,20 +256,22 @@ wxPNGReader::SetPalette(int n, rgb_color_struct *rgb_struct) if (bgindex != -1) r[bgindex] = g[bgindex] = b[bgindex] = 0; - Palette->Create(n, r, g, b); + m_palette->Create(n, r, g, b); ColorType |= (COLORTYPE_PALETTE | COLORTYPE_COLOR); return true ; -// return (DibSetUsage(lpbi, (HPALETTE) Palette->GetHPALETTE(), WXIMA_COLORS ) != 0); +// return (DibSetUsage(lpbi, (HPALETTE) m_palette->GetHPALETTE(), WXIMA_COLORS ) != 0); } void wxPNGReader::NullData() { if (lpbi) { - wxMacDestroyGWorld( lpbi ) ; + wxMacDestroyGWorld( (GWorldPtr) lpbi ) ; + lpbi = NULL; + } + if (m_palette != NULL) { + delete m_palette; + m_palette = NULL; } - delete Palette; - lpbi = NULL; - Palette = NULL; } wxBitmap* wxPNGReader::GetBitmap(void) @@ -281,8 +294,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap) bitmap->SetWidth(GetWidth()); bitmap->SetHeight(GetHeight()); bitmap->SetDepth(GetDepth()); - if ( GetDepth() > 1 && Palette ) - bitmap->SetPalette(*Palette); + if ( GetDepth() > 1 && m_palette ) + bitmap->SetPalette(*m_palette); bitmap->SetOk(TRUE); @@ -313,9 +326,9 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap) ReleaseDC(NULL, dc2); HBITMAP oldBitmap = (HBITMAP) ::SelectObject(dc, tmpBitmap); - if ( Palette ) + if ( m_palette ) { - HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) Palette->GetHPALETTE(), FALSE); + HPALETTE oldPal = ::SelectPalette(dc, (HPALETTE) m_palette->GetHPALETTE(), FALSE); ::RealizePalette(dc); } @@ -333,8 +346,8 @@ bool wxPNGReader::InstantiateBitmap(wxBitmap *bitmap) bitmap->SetWidth(GetWidth()); bitmap->SetHeight(GetHeight()); bitmap->SetDepth(GetDepth()); - if ( GetDepth() > 1 && Palette ) - bitmap->SetPalette(*Palette); + if ( GetDepth() > 1 && m_palette ) + bitmap->SetPalette(*m_palette); bitmap->SetOk(TRUE); @@ -410,7 +423,8 @@ bool wxPNGReader::ReadFile(char * ImageFileName) wxPNGReaderIter iter(this); /* open the file */ - fp = fopen(wxUnix2MacFilename( ImageFileName ), "rb"); + fp = fopen( ImageFileName , "rb" ); + if (!fp) return FALSE; @@ -426,7 +440,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName) if (!info_ptr) { fclose(fp); - delete(png_ptr); + delete png_ptr; return FALSE; } /* set error handling */ @@ -434,8 +448,8 @@ bool wxPNGReader::ReadFile(char * ImageFileName) { png_read_destroy(png_ptr, info_ptr, (png_info *)0); fclose(fp); - delete(png_ptr); - delete(info_ptr); + delete png_ptr; + delete info_ptr; /* If we get here, we had a problem reading the file */ return FALSE; @@ -507,7 +521,7 @@ bool wxPNGReader::ReadFile(char * ImageFileName) GetGWorld( &origPort , &origDevice ) ; // ignore shapedc - SetGWorld( lpbi , NULL ) ; + SetGWorld( (GWorldPtr) lpbi , NULL ) ; do { // (unsigned char *)iter.GetRow(); @@ -617,8 +631,8 @@ bool wxPNGReader::ReadFile(char * ImageFileName) png_read_destroy(png_ptr, info_ptr, (png_info *)0); /* free the structures */ - delete(png_ptr); - delete(info_ptr); + delete png_ptr; + delete info_ptr; /* close the file */ fclose(fp); @@ -657,7 +671,7 @@ bool wxPNGReader::SaveFile(char * ImageFileName) if (!info_ptr) { fclose(fp); - delete(png_ptr); + delete png_ptr; return FALSE; } @@ -666,8 +680,8 @@ bool wxPNGReader::SaveFile(char * ImageFileName) { png_write_destroy(png_ptr); fclose(fp); - delete(png_ptr); - delete(info_ptr); + delete png_ptr; + delete info_ptr; /* If we get here, we had a problem reading the file */ return FALSE; @@ -764,8 +778,8 @@ bool wxPNGReader::SaveFile(char * ImageFileName) delete[] (info_ptr->palette); /* free the structures */ - delete(png_ptr); - delete(info_ptr); + delete png_ptr; + delete info_ptr; /* close the file */ fclose(fp); @@ -818,7 +832,7 @@ bool wxPNGReader::SaveXPM(char *filename, char *name) if ( !GetPalette() ) return FALSE; - ofstream str(filename); + wxSTD ofstream str(filename); if ( str.bad() ) return FALSE; @@ -882,7 +896,7 @@ bool wxPNGFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long fla return FALSE; } -bool wxPNGFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal) +bool wxPNGFileHandler::SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *pal) { return FALSE; }