Patch #826420, and also adapted to new SWIG

[wxWidgets.git] / include / wx / mac / pngread.h

diff --git a/include/wx/mac/pngread.h b/include/wx/mac/pngread.h
index 83ef95baf576c5a1d2ecf3b3ad3a1b006ca124fe..d1a8b96a5a09d194e614e92a9db25dfc993b4779 100644 (file)
--- a/include/wx/mac/pngread.h
+++ b/include/wx/mac/pngread.h
@@ -1,9 +1,9 @@
 /*
- * File:       pngread.h
- * Purpose:    PNG file reader
- * Author:     Alejandro Aguilar Sierra/Julian Smart
- * Created:    1995
- * Copyright:  (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ * File:    pngread.h
+ * Purpose:    PNG file reader
+ * Author:    Alejandro Aguilar Sierra/Julian Smart
+ * Created:    1995
+ * Copyright:    (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *
  *
  */
@@ -11,7 +11,7 @@
 #ifndef _WX_PNGREAD__
 #define _WX_PNGREAD__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "pngread.h"
 #endif
 
@@ -25,34 +25,34 @@ typedef byte * ImagePointerType;
 
 typedef struct
 {
-       byte red;
-       byte green;
+    byte red;
+    byte green;
    byte blue;
 } rgb_color_struct;
 
 
-#define COLORTYPE_PALETTE      1
-#define COLORTYPE_COLOR                2
-#define COLORTYPE_ALPHA                4
+#define COLORTYPE_PALETTE    1
+#define COLORTYPE_COLOR        2
+#define COLORTYPE_ALPHA        4
 
 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;
+  void *lpbi;
   int bgindex;
-  wxPalette* Palette;
+  wxPalette* m_palette;
   bool imageOK;
 friend class wxPNGReaderIter;
 public:
@@ -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; }
@@ -98,9 +98,9 @@ public:
 class wxPNGReaderIter
 {
 protected:
-  int Itx, Ity;                                // Counters
+  int Itx, Ity;                // Counters
   int Stepx, Stepy;
-  ImagePointerType IterImage;                  //  Image pointer
+  ImagePointerType IterImage;          //  Image pointer
   wxPNGReader *ima;
 public:
 // Constructors
@@ -146,7 +146,7 @@ inline
 wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax)
 {
   if (ima)
-        IterImage = ima->RawImage;
+     IterImage = ima->RawImage;
   Itx = Ity = 0;
   Stepx = Stepy = 0;
 }
@@ -161,9 +161,9 @@ inline
 bool wxPNGReaderIter::ItOK ()
 {
   if (ima)
-        return ima->Inside(Itx, Ity);
+     return ima->Inside(Itx, Ity);
   else
-        return FALSE;
+     return FALSE;
 }
 
 
@@ -209,7 +209,7 @@ inline void wxPNGReaderIter::SetRow(byte *buf, int n)
 // Here should be bcopy or memcpy
   //_fmemcpy(IterImage, (void far *)buf, n);
   if (n<0)
-        n = ima->GetWidth();
+     n = ima->GetWidth();
 
   for (int i=0; i<n; i++) IterImage[i] = buf[i];
 }
@@ -227,45 +227,45 @@ inline ImagePointerType wxPNGReaderIter::GetRow()
 inline bool wxPNGReaderIter::NextByte()
 {
   if (++Itx < ima->EfeWidth)
-        return 1;
+     return 1;
   else
-        if (++Ity < ima->Height)
-        {
-               IterImage += ima->EfeWidth;
-               Itx = 0;
-               return 1;
-        } else
-               return 0;
+     if (++Ity < ima->Height)
+     {
+        IterImage += ima->EfeWidth;
+        Itx = 0;
+        return 1;
+     } else
+        return 0;
 }
 
 inline bool wxPNGReaderIter::PrevByte()
 {
   if (--Itx >= 0)
-        return 1;
+     return 1;
   else
-        if (--Ity >= 0)
-        {
-               IterImage -= ima->EfeWidth;
-               Itx = 0;
-               return 1;
-        } else
-               return 0;
+     if (--Ity >= 0)
+     {
+        IterImage -= ima->EfeWidth;
+        Itx = 0;
+        return 1;
+     } else
+        return 0;
 }
 
 inline bool wxPNGReaderIter::NextStep()
 {
   Itx += Stepx;
   if (Itx < ima->EfeWidth)
-        return 1;
+     return 1;
   else {
-        Ity += Stepy;
-        if (Ity < ima->Height)
-        {
-               IterImage += ima->EfeWidth;
-               Itx = 0;
-               return 1;
-        } else
-               return 0;
+     Ity += Stepy;
+     if (Ity < ima->Height)
+     {
+        IterImage += ima->EfeWidth;
+        Itx = 0;
+        return 1;
+     } else
+        return 0;
   }
 }
 
@@ -273,16 +273,16 @@ inline bool wxPNGReaderIter::PrevStep()
 {
   Itx -= Stepx;
   if (Itx >= 0)
-        return 1;
-  else {       
-        Ity -= Stepy;
-        if (Ity >= 0 && Ity < ima->Height)
-        {
-               IterImage -= ima->EfeWidth;
-               Itx = 0;
-               return 1;
-        } else
-               return 0;
+     return 1;
+  else {
+     Ity -= Stepy;
+     if (Ity >= 0 && Ity < ima->Height)
+     {
+        IterImage -= ima->EfeWidth;
+        Itx = 0;
+        return 1;
+     } else
+        return 0;
   }
 }