X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1044a386f0521b9b805b142547783acb96d1a406..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/imagpcx.cpp diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index e10679ec8b..73bee7edf3 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -20,18 +20,23 @@ #pragma hdrstop #endif +#ifndef WX_PRECOMP +# include "wx/defs.h" +#endif + +#if wxUSE_STREAMS && wxUSE_PCX + #include "wx/image.h" #include "wx/wfstream.h" #include "wx/module.h" #include "wx/log.h" -#if wxUSE_PCX //----------------------------------------------------------------------------- // PCX decoding //----------------------------------------------------------------------------- -void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s) +void RLEencode(unsigned char *WXUNUSED(p), unsigned int WXUNUSED(size), wxOutputStream& WXUNUSED(s)) { } @@ -71,12 +76,12 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s) /* PCX header */ -#define HDR_VERSION 1 +#define HDR_VERSION 1 #define HDR_ENCODING 2 #define HDR_BITSPERPIXEL 3 #define HDR_XMIN 4 #define HDR_YMIN 6 -#define HDR_XMAX 8 +#define HDR_XMAX 8 #define HDR_YMAX 10 #define HDR_NPLANES 65 #define HDR_BYTESPERLINE 66 @@ -196,7 +201,7 @@ int ReadPCX(wxImage *image, wxInputStream& stream) { *(dst++) = p[i]; *(dst++) = p[i + bytesperline]; - *(dst++) = p[i + 2 * bytesperline]; + *(dst++) = p[i + 2 * bytesperline]; } break; } @@ -217,8 +222,6 @@ int ReadPCX(wxImage *image, wxInputStream& stream) IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler) #endif -#if wxUSE_STREAMS - bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose ) { int error; @@ -226,7 +229,7 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose if (!CanRead(stream)) { if (verbose) - wxLogError(_T("wxPCXHandler: this is not a PCX file")); + wxLogError(wxT("wxPCXHandler: this is not a PCX file")); return FALSE; } @@ -239,10 +242,10 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose { switch (error) { - case E_FORMATO: wxLogError(_T("wxPCXHandler: image format unsupported")); break; - case E_MEMORIA: wxLogError(_T("wxPCXHandler: couldn't allocate memory")); break; - case E_VERSION: wxLogError(_T("wxPCXHandler: version number too low")); break; - default: wxLogError(_T("wxPCXHandler: unknown error !!!")); + case E_FORMATO: wxLogError(wxT("wxPCXHandler: image format unsupported")); break; + case E_MEMORIA: wxLogError(wxT("wxPCXHandler: couldn't allocate memory")); break; + case E_VERSION: wxLogError(wxT("wxPCXHandler: version number too low")); break; + default: wxLogError(wxT("wxPCXHandler: unknown error !!!")); } } image->Destroy(); @@ -252,15 +255,15 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose return TRUE; } -bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose ) +bool wxPCXHandler::SaveFile( wxImage *WXUNUSED(image), wxOutputStream& WXUNUSED(stream), bool verbose ) { if (verbose) - wxLogError(_T("wxPCXHandler::SaveFile still not implemented")); + wxLogError(wxT("wxPCXHandler::SaveFile still not implemented")); return FALSE; } -bool wxPCXHandler::CanRead( wxInputStream& stream ) +bool wxPCXHandler::DoCanRead( wxInputStream& stream ) { unsigned char c; off_t pos; @@ -274,7 +277,5 @@ bool wxPCXHandler::CanRead( wxInputStream& stream ) return (c == 10); } -#endif // wxUSE_STREAMS - -#endif // wxUSE_PCX +#endif // wxUSE_STREAMS && wxUSE_PCX