X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57beadd2b7a8641a783cb7b30c3d4a73f5b07050..11a23db53128bf244a089123b7fd27deb577a889:/src/common/imagpnm.cpp diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp index 85fbdc08a9..d853912087 100644 --- a/src/common/imagpnm.cpp +++ b/src/common/imagpnm.cpp @@ -2,7 +2,6 @@ // Name: src/common/imagpnm.cpp // Purpose: wxImage PNM handler // Author: Sylvain Bougnoux -// RCS-ID: $Id$ // Copyright: (c) Sylvain Bougnoux // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -69,7 +68,10 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose case wxT('5'): // RAW Grey case wxT('6'): break; default: - if (verbose) wxLogError(_("PNM: File format is not recognized.")); + if (verbose) + { + wxLogError(_("PNM: File format is not recognized.")); + } return false; } @@ -85,7 +87,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose if (!ptr) { if (verbose) + { wxLogError( _("PNM: Couldn't allocate memory.") ); + } return false; } @@ -103,7 +107,10 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose *ptr++=(unsigned char)value; // B if ( !buf_stream ) { - if (verbose) wxLogError(_("PNM: File seems truncated.")); + if (verbose) + { + wxLogError(_("PNM: File seems truncated.")); + } return false; } } @@ -122,7 +129,10 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose if ( !buf_stream ) { - if (verbose) wxLogError(_("PNM: File seems truncated.")); + if (verbose) + { + wxLogError(_("PNM: File seems truncated.")); + } return false; } } @@ -141,7 +151,10 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose *ptr++=value; // B if ( !buf_stream ) { - if (verbose) wxLogError(_("PNM: File seems truncated.")); + if (verbose) + { + wxLogError(_("PNM: File seems truncated.")); + } return false; } } @@ -180,6 +193,7 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream ) { Skip_Comment(stream); + // it's ok to modify the stream position here if ( stream.GetC() == 'P' ) { switch ( stream.GetC() )