X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef6bd27b357788fa1ea5126824e72e1e277e8e4e..349efbaa89b499557d9a26320bcbd9b012aac9d2:/include/wx/mac/pngread.h diff --git a/include/wx/mac/pngread.h b/include/wx/mac/pngread.h index f6d1d707ec..2a5b4b40cd 100644 --- a/include/wx/mac/pngread.h +++ b/include/wx/mac/pngread.h @@ -40,25 +40,25 @@ class wxPNGReader protected: int filetype; char filename[255]; - ImagePointerType RawImage; // Image data + ImagePointerType RawImage; // Image data - int Width, Height; // Dimensions - int Depth; // (bits x pixel) - int ColorType; // Bit 1 = Palette used - // Bit 2 = Color used - // Bit 3 = Alpha used + int Width, Height; // Dimensions + int Depth; // (bits x pixel) + int ColorType; // Bit 1 = Palette used + // Bit 2 = Color used + // Bit 3 = Alpha used - long EfeWidth; // Efective Width + long EfeWidth; // Efective Width GWorldPtr lpbi; int bgindex; - wxPalette* Palette; + wxPalette* m_palette; bool imageOK; friend class wxPNGReaderIter; public: wxPNGReader(void); wxPNGReader (char* ImageFileName); // Read an image file - ~wxPNGReader (); + virtual ~wxPNGReader (); void Create(int width, int height, int deep, int colortype=-1); @@ -80,7 +80,7 @@ public: bool SetPalette(wxPalette* colourmap); bool SetPalette(int n, rgb_color_struct *rgb_struct); bool SetPalette(int n, byte *r, byte *g=0, byte *b=0); - wxPalette* GetPalette() const { return Palette; } + wxPalette* GetPalette() const { return m_palette; } void NullData(); inline int GetBGIndex(void) { return bgindex; }