X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1044a386f0521b9b805b142547783acb96d1a406..7b9da2077d0975db6c965a85c91d5aca671ab5e3:/src/common/imagpnm.cpp

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index d220042433..c2ed7bf13c 100644
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -19,15 +19,15 @@
 #pragma hdrstop
 #endif
 
-#include "wx/image.h"
-#include "wx/log.h"
-#include "wx/txtstrm.h"
+#ifndef WX_PRECOMP
+#  include "wx/setup.h"
+#endif
 
 #if wxUSE_PNM
 
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
+#include "wx/image.h"
+#include "wx/log.h"
+#include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------
 // wxBMPHandler
@@ -39,16 +39,13 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
-//#include <stream.h> // for cout
-
 void Skip_Comment(wxInputStream &stream)
 {
-  wxString line;
   wxTextInputStream text_stream(stream);
 
-  if (stream.Peek()==_T('#')) 
+  if (stream.Peek()==wxT('#'))
     {
-      text_stream >> line;
+      text_stream.ReadLine();
       Skip_Comment(stream);
     }
 }
@@ -57,9 +54,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 {
     wxUint32  width, height;
     wxUint16  maxval;
-    wxString  line;
     char      c(0);
-    
+
     image->Destroy();
 
     /*
@@ -70,26 +66,26 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     wxTextInputStream text_stream(buf_stream);
 
     Skip_Comment(buf_stream);
-    if (buf_stream.GetC()==_T('P')) c=buf_stream.GetC();
+    if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
 
     switch (c)
       {
-      case _T('2'):
-	wxLogError(_T("Loading Grey Ascii PNM image is not yet implemented."));
-	return FALSE;
-      case _T('5'):
-	wxLogError(_T("Loading Grey Raw PNM image is not yet implemented."));
-	return FALSE;
-      case _T('3'): case _T('6'): break;
-	default :
-	wxLogError(_T("Loading PNM image : file not recognized."));
-	return FALSE;
+      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;
       }
 
-    text_stream >> line; // for the \n
+    text_stream.ReadLine(); // for the \n
     Skip_Comment(buf_stream);
     text_stream >> width >> height ;
-    Skip_Comment(buf_stream); 
+    Skip_Comment(buf_stream);
     text_stream >> maxval;
 
     //cout << line << " " << width << " " << height << " " << maxval << endl;
@@ -97,26 +93,26 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {
-        wxLogError( _T("Cannot allocate RAM for RGB data in PNM file.") );
-	return FALSE;
+        wxLogError( wxT("Cannot allocate RAM for RGB data in PNM file.") );
+        return FALSE;
     }
 
    if (c=='3') // Ascii RBG
-      { 
-	wxUint32 value, size=3*width*height;
-	for (wxUint32 i=0; i<size; ++i)
-	  {
-	    //this is very slow !!!
-	    //I wonder how we can make any better ?
-	    value=text_stream.Read32();
-	    *ptr++=(unsigned char)value;
-
-	    if (buf_stream.LastError()!=wxSTREAM_NOERROR)
-	      {
-		wxLogError(_T("Loading PNM image : file seems truncated."));
-		return FALSE;
-	      }
-	  }
+      {
+        wxUint32 value, size=3*width*height;
+        for (wxUint32 i=0; i<size; ++i)
+          {
+            //this is very slow !!!
+            //I wonder how we can make any better ?
+            value=text_stream.Read32();
+            *ptr++=(unsigned char)value;
+
+            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
+              {
+                wxLogError(wxT("Loading PNM image : file seems truncated."));
+                return FALSE;
+              }
+          }
       }
     if (c=='6') // Raw RGB
       buf_stream.Read( ptr, 3*width*height );
@@ -129,9 +125,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
 {
     wxTextOutputStream text_stream(stream);
-    
-    //text_stream << "P6" << endl 
-    //<< image->GetWidth() << " " << image->GetHeight() << endl 
+
+    //text_stream << "P6" << endl
+    //<< image->GetWidth() << " " << image->GetHeight() << endl
     //<< "255" << endl;
     text_stream << "P6\n" << image->GetWidth() << " " << image->GetHeight() << "\n255\n";
     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
@@ -139,19 +135,22 @@ bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUS
     return (stream.LastError()==wxStream_NOERROR);
 }
 
-bool wxPNMHandler::CanRead( wxInputStream& stream )
+bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 {
-    off_t pos=stream.TellI();
+    off_t pos = stream.TellI();
 
     Skip_Comment(stream);
 
-    if (stream.GetC()==_T('P'))
-      switch (stream.GetC())
-	{
-	case _T('3'): case _T('6'):
-	  stream.SeekI(pos);
-	  return TRUE;
-	}
+    if ( stream.GetC() == 'P' )
+    {
+        switch (stream.GetC())
+        {
+            case '3':
+            case '6':
+                stream.SeekI(pos);
+                return TRUE;
+        }
+    }
 
     stream.SeekI(pos);
     return FALSE;
@@ -161,4 +160,3 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 #endif // wxUSE_STREAMS
 
 #endif // wxUSE_PNM
-