X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2b8bd55375cde48319475e174f6eb86e4dcdd33..4882bf1b78790ddf73deb914804ba0aceb75d7ec:/src/common/imagpnm.cpp

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index e7de922c9c..d29174929c 100644
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -19,14 +19,16 @@
 #pragma hdrstop
 #endif
 
+#ifndef WX_PRECOMP
+#  include "wx/setup.h"
+#endif
+
+#if wxUSE_PNM
+
 #include "wx/image.h"
 #include "wx/log.h"
 #include "wx/txtstrm.h"
 
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
@@ -37,14 +39,12 @@ 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;
       Skip_Comment(stream);
@@ -64,29 +64,30 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
      * Read the PNM header
      */
 
-    wxTextInputStream text_stream(stream);
+    wxBufferedInputStream buf_stream(stream);
+    wxTextInputStream text_stream(buf_stream);
 
-    Skip_Comment(stream);
-    if (stream.GetC()==_T('P')) c=stream.GetC();
+    Skip_Comment(buf_stream);
+    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."));
+      case wxT('2'):
+	wxLogError(wxT("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."));
+      case wxT('5'):
+	wxLogError(wxT("Loading Grey Raw PNM image is not yet implemented."));
 	return FALSE;
-      case _T('3'): case _T('6'): break;
+      case wxT('3'): case wxT('6'): break;
 	default :
-	wxLogError(_T("Loading PNM image : file not recognized."));
+	wxLogError(wxT("Loading PNM image : file not recognized."));
 	return FALSE;
       }
 
     text_stream >> line; // for the \n
-    Skip_Comment(stream);
+    Skip_Comment(buf_stream);
     text_stream >> width >> height ;
-    Skip_Comment(stream); 
+    Skip_Comment(buf_stream); 
     text_stream >> maxval;
 
     //cout << line << " " << width << " " << height << " " << maxval << endl;
@@ -94,12 +95,10 @@ 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.") );
+        wxLogError( wxT("Cannot allocate RAM for RGB data in PNM file.") );
 	return FALSE;
     }
 
-    wxBufferedInputStream buf_stream(stream);
-
    if (c=='3') // Ascii RBG
       { 
 	wxUint32 value, size=3*width*height;
@@ -112,7 +111,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 
 	    if (buf_stream.LastError()!=wxSTREAM_NOERROR)
 	      {
-		wxLogError(_T("Loading PNM image : file seems truncated."));
+		wxLogError(wxT("Loading PNM image : file seems truncated."));
 		return FALSE;
 	      }
 	  }
@@ -144,10 +143,10 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 
     Skip_Comment(stream);
 
-    if (stream.GetC()==_T('P'))
+    if (stream.GetC()==wxT('P'))
       switch (stream.GetC())
 	{
-	case _T('3'): case _T('6'):
+	case wxT('3'): case wxT('6'):
 	  stream.SeekI(pos);
 	  return TRUE;
 	}
@@ -159,4 +158,4 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 
 #endif // wxUSE_STREAMS
 
-
+#endif // wxUSE_PNM