avoiding crashes on osx during app shutdown

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

diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h
index 5c46dc9eb7180929f7c98d9d3e61e1920393b4b3..e66f475a3bf6e762287eafde451248b2ac77dc9f 100644 (file)
--- a/include/wx/os2/pngread.h
+++ b/include/wx/os2/pngread.h
@@ -1,9 +1,10 @@
 /*
 /*

- * 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:    wx/os2/pngread.h
+ * Purpose: PNG file reader
+ * Author:  Alejandro Aguilar Sierra/Julian Smart
+ * Created: 1995
+ * RCS-ID:  $Id$
+ * Copyright: (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx>

  *
  *
  */
  *
  *
  */


@@ -21,15 +22,15 @@ typedef byte* ImagePointerType;
 
 typedef struct
 {
 
 typedef struct
 {

-       byte red;
-       byte green;
-   byte blue;
+    byte red;
+    byte green;
+    byte blue;

 } rgb_color_struct;
 
 
 } 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
 {
 
 class wxPNGReader
 {


@@ -143,7 +144,7 @@ inline
 wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax)
 {
   if (ima)
 wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax)
 {
   if (ima)

-        IterImage = ima->RawImage;
+    IterImage = ima->RawImage;

   Itx = Ity = 0;
   Stepx = Stepy = 0;
 }
   Itx = Ity = 0;
   Stepx = Stepy = 0;
 }


@@ -158,9 +159,9 @@ inline
 bool wxPNGReaderIter::ItOK ()
 {
   if (ima)
 bool wxPNGReaderIter::ItOK ()
 {
   if (ima)

-        return ima->Inside(Itx, Ity);
+    return ima->Inside(Itx, Ity);

   else
   else

-        return FALSE;
+    return FALSE;

 }
 
 
 }
 
 


@@ -206,7 +207,7 @@ inline void wxPNGReaderIter::SetRow(byte *buf, int n)
 // Here should be bcopy or memcpy
   //_fmemcpy(IterImage, (void far *)buf, n);
   if (n<0)
 // 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];
 }
 
   for (int i=0; i<n; i++) IterImage[i] = buf[i];
 }


@@ -284,4 +285,4 @@ inline bool wxPNGReaderIter::PrevStep()
 }
 
 #endif
 }
 
 #endif

-
+    // _WX_PNGREAD__
\ No newline at end of file