X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..6842d18650b487249b4ae29d0d7e17231b24cde8:/src/common/imagpcx.cpp diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp index c2793f6d5f..73bee7edf3 100644 --- a/src/common/imagpcx.cpp +++ b/src/common/imagpcx.cpp @@ -24,7 +24,7 @@ # include "wx/defs.h" #endif -#if wxUSE_STREAMS && wxUSE_PCX +#if wxUSE_STREAMS && wxUSE_PCX #include "wx/image.h" #include "wx/wfstream.h" @@ -76,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 @@ -201,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; } @@ -229,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; } @@ -242,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(); @@ -258,12 +258,12 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& 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;