X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..438959cca892a7651634cc3a7aad4819ac49b23c:/include/wx/os2/pngread.h diff --git a/include/wx/os2/pngread.h b/include/wx/os2/pngread.h index 5c46dc9eb7..6776c67f63 100644 --- 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 + * 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 * * */ @@ -21,15 +22,15 @@ typedef byte* ImagePointerType; typedef struct { - byte red; - byte green; - byte blue; + 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 { @@ -61,10 +62,10 @@ public: bool ReadFile( wxChar* ImageFileName=0 ); bool SaveFile( wxChar* ImageFileName=0 ); bool SaveXPM(wxChar *filename, wxChar *name = 0); - int GetWidth( void ) const { return Width; }; - int GetHeight( void ) const { return Height; }; - int GetDepth( void ) const { return Depth; }; - int GetColorType( void ) const { return ColorType; }; + int GetWidth( void ) const { return Width; } + int GetHeight( void ) const { return Height; } + int GetDepth( void ) const { return Depth; } + int GetColorType( void ) const { return ColorType; } int GetIndex(int x, int y); bool GetRGB(int x, int y, byte* r, byte* g, byte* b); @@ -143,7 +144,7 @@ inline wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax) { if (ima) - IterImage = ima->RawImage; + IterImage = ima->RawImage; Itx = Ity = 0; Stepx = Stepy = 0; } @@ -158,9 +159,9 @@ inline bool wxPNGReaderIter::ItOK () { if (ima) - return ima->Inside(Itx, Ity); + return ima->Inside(Itx, Ity); 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) - n = ima->GetWidth(); + n = ima->GetWidth(); for (int i=0; i