String corrections

[wxWidgets.git] / src / common / imagpnm.cpp

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 3646d49e8205beff3b0eb7bbabe1fe626e07fdab..cea78ca07e40aa360d49700417a7bf98731a07ac 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "imagpnm.h"
 #endif
 
 #pragma implementation "imagpnm.h"
 #endif
 


@@ -22,7 +22,7 @@
 #  include "wx/setup.h"
 #endif
 
 #  include "wx/setup.h"
 #endif
 

-#if wxUSE_PNM
+#if wxUSE_IMAGE && wxUSE_PNM

 
 #include "wx/imagpnm.h"
 #include "wx/log.h"
 
 #include "wx/imagpnm.h"
 #include "wx/log.h"


@@ -39,12 +39,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 
 void Skip_Comment(wxInputStream &stream)
 {
 
 void Skip_Comment(wxInputStream &stream)
 {

-  wxTextInputStream text_stream(stream);
+    wxTextInputStream text_stream(stream);

 
 

-  if (stream.Peek()==wxT('#'))
+    if (stream.Peek()==wxT('#'))

     {
     {

-      text_stream.ReadLine();
-      Skip_Comment(stream);
+        text_stream.ReadLine();
+        Skip_Comment(stream);

     }
 }
 
     }
 }
 


@@ -107,7 +107,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             value=text_stream.Read32();
             *ptr++=(unsigned char)value;
 
             value=text_stream.Read32();
             *ptr++=(unsigned char)value;
 

-            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
+            if ( !buf_stream )

               {
                 if (verbose) wxLogError(_("PNM: File seems truncated."));
                 return FALSE;
               {
                 if (verbose) wxLogError(_("PNM: File seems truncated."));
                 return FALSE;


@@ -119,7 +119,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     image->SetMask( FALSE );
 
 
     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) )
 }
 
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )


@@ -129,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" << 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());
 
     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
 

-    return (stream.LastError()==wxStream_NOERROR);
+    return stream.IsOk();

 }
 
 bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 {
 }
 
 bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 {

-    off_t pos = stream.TellI();
-

     Skip_Comment(stream);
 
     if ( stream.GetC() == 'P' )
     Skip_Comment(stream);
 
     if ( stream.GetC() == 'P' )


@@ -147,12 +146,10 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
         {
             case '3':
             case '6':
         {
             case '3':
             case '6':

-                stream.SeekI(pos);

                 return TRUE;
         }
     }
 
                 return TRUE;
         }
     }
 

-    stream.SeekI(pos);

     return FALSE;
 }
 
     return FALSE;
 }