X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7448de8d8d697f8f208515a1fc96c88ed009dd56..538f4dd82b7d37293a45516da0036b453f631f9f:/src/common/imagpnm.cpp?ds=inline diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp index a7775d2a29..731220450b 100644 --- a/src/common/imagpnm.cpp +++ b/src/common/imagpnm.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: imagpnm.cpp +// Name: src/common/imagpnm.cpp // Purpose: wxImage PNM handler // Author: Sylvain Bougnoux // RCS-ID: $Id$ @@ -7,26 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "imagpnm.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -# include "wx/setup.h" + #pragma hdrstop #endif #if wxUSE_IMAGE && wxUSE_PNM #include "wx/imagpnm.h" -#include "wx/log.h" -#include "wx/intl.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" +#endif + #include "wx/txtstrm.h" //----------------------------------------------------------------------------- @@ -73,7 +69,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; } @@ -89,7 +88,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose if (!ptr) { if (verbose) + { wxLogError( _("PNM: Couldn't allocate memory.") ); + } return false; } @@ -100,12 +101,17 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose for (wxUint32 i=0; iSetMask( false ); @@ -170,12 +194,15 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream ) { Skip_Comment(stream); + // it's ok to modify the stream position here if ( stream.GetC() == 'P' ) { - switch (stream.GetC()) + switch ( stream.GetC() ) { - case '3': - case '6': + case '2': // ASCII Grey + case '3': // ASCII RGB + case '5': // RAW Grey + case '6': // RAW RGB return true; } } @@ -186,4 +213,4 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream ) #endif // wxUSE_STREAMS -#endif // wxUSE_PNM +#endif // wxUSE_IMAGE && wxUSE_PNM