added test for env var expansion

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 3c34cbc82236a10ee4bfc8df87531ec1fe943e29..a11007de33c94d4f177031c3705b2107d3c3c36e 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -7,10 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -23,9 +22,9 @@
 #  include "wx/setup.h"
 #endif
 
 #  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"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/txtstrm.h"


@@ -138,8 +137,6 @@ bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUS
 
 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' )


@@ -148,12 +145,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;
 }