X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/995612e2abc1131458863ed1d3e55206df7c33de..8b655af19d31f61990ceb794edd3df7cf41414e9:/src/common/imagpnm.cpp

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 3447c16544..984de04ca4 100644
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*
-   We don't put pragma implement in this file because it is already present in
-   src/common/image.cpp
-*/
+#ifdef __GNUG__
+#pragma implementation "imagpnm.h"
+#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
@@ -23,39 +22,36 @@
 #  include "wx/setup.h"
 #endif
 
-#if wxUSE_PNM
+#if wxUSE_IMAGE && wxUSE_PNM
 
-#include "wx/image.h"
+#include "wx/imagpnm.h"
 #include "wx/log.h"
+#include "wx/intl.h"
 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
-#endif
 
 #if wxUSE_STREAMS
 
 void Skip_Comment(wxInputStream &stream)
 {
-  wxString line;
-  wxTextInputStream text_stream(stream);
+    wxTextInputStream text_stream(stream);
 
-  if (stream.Peek()==wxT('#'))
+    if (stream.Peek()==wxT('#'))
     {
-      text_stream >> line;
-      Skip_Comment(stream);
+        text_stream.ReadLine();
+        Skip_Comment(stream);
     }
 }
 
-bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) )
+bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     wxUint32  width, height;
     wxUint16  maxval;
-    wxString  line;
     char      c(0);
 
     image->Destroy();
@@ -71,20 +67,21 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
 
     switch (c)
-      {
-      case wxT('2'):
-        wxLogError(wxT("Loading Grey Ascii PNM image is not yet implemented."));
-        return FALSE;
-      case wxT('5'):
-        wxLogError(wxT("Loading Grey Raw PNM image is not yet implemented."));
-        return FALSE;
-      case wxT('3'): case wxT('6'): break;
-        default :
-        wxLogError(wxT("Loading PNM image : file not recognized."));
-        return FALSE;
-      }
+    {
+        case wxT('2'):
+            if (verbose) wxLogError(_("Loading Grey Ascii PNM image is not yet implemented."));
+            return FALSE;
+        case wxT('5'):
+            if (verbose) wxLogError(_("Loading Grey Raw PNM image is not yet implemented."));
+            return FALSE;
+        case wxT('3'): 
+	case wxT('6'): break;
+        default:
+            if (verbose) wxLogError(_("PNM: File format is not recognized."));
+            return FALSE;
+    }
 
-    text_stream >> line; // for the \n
+    text_stream.ReadLine(); // for the \n
     Skip_Comment(buf_stream);
     text_stream >> width >> height ;
     Skip_Comment(buf_stream);
@@ -95,7 +92,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {
-        wxLogError( wxT("Cannot allocate RAM for RGB data in PNM file.") );
+        if (verbose)
+           wxLogError( _("PNM: Couldn't allocate memory.") );
         return FALSE;
     }
 
@@ -109,9 +107,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
             value=text_stream.Read32();
             *ptr++=(unsigned char)value;
 
-            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
+            if ( !buf_stream )
               {
-                wxLogError(wxT("Loading PNM image : file seems truncated."));
+                if (verbose) wxLogError(_("PNM: File seems truncated."));
                 return FALSE;
               }
           }
@@ -121,7 +119,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 
     image->SetMask( FALSE );
 
-    return (buf_stream.LastError()==wxStream_NOERROR || buf_stream.LastError()==wxStream_EOF);
+    const wxStreamError err = buf_stream.GetLastError();
+    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
 }
 
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
@@ -131,16 +130,14 @@ bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUS
     //text_stream << "P6" << endl
     //<< image->GetWidth() << " " << image->GetHeight() << endl
     //<< "255" << endl;
-    text_stream << "P6\n" << image->GetWidth() << " " << image->GetHeight() << "\n255\n";
+    text_stream << wxT("P6\n") << image->GetWidth() << wxT(" ") << image->GetHeight() << wxT("\n255\n");
     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
 
-    return (stream.LastError()==wxStream_NOERROR);
+    return stream.IsOk();
 }
 
 bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 {
-    off_t pos = stream.TellI();
-
     Skip_Comment(stream);
 
     if ( stream.GetC() == 'P' )
@@ -149,12 +146,10 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
         {
             case '3':
             case '6':
-                stream.SeekI(pos);
                 return TRUE;
         }
     }
 
-    stream.SeekI(pos);
     return FALSE;
 }