Fixes for gcc 2.95 and AIX.

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index e7de922c9cdf50ee2bd1694793188ac1fd2e7a1a..5352da9f4fdd23a931ccea5a6f7f3000c9233114 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -64,10 +64,11 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
      * Read the PNM header
      */
 
      * 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()==_T('P')) c=buf_stream.GetC();

 
     switch (c)
       {
 
     switch (c)
       {


@@ -84,9 +85,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
       }
 
     text_stream >> line; // for the \n
       }
 
     text_stream >> line; // for the \n

-    Skip_Comment(stream);
+    Skip_Comment(buf_stream);

     text_stream >> width >> height ;
     text_stream >> width >> height ;

-    Skip_Comment(stream); 
+    Skip_Comment(buf_stream); 

     text_stream >> maxval;
 
     //cout << line << " " << width << " " << height << " " << maxval << endl;
     text_stream >> maxval;
 
     //cout << line << " " << width << " " << height << " " << maxval << endl;


@@ -98,8 +99,6 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
        return FALSE;
     }
 
        return FALSE;
     }
 

-    wxBufferedInputStream buf_stream(stream);
-

    if (c=='3') // Ascii RBG
       { 
        wxUint32 value, size=3*width*height;
    if (c=='3') // Ascii RBG
       { 
        wxUint32 value, size=3*width*height;