Several changes and updates

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 75a0b49d79c3eaca2a8eecd85fbc1a7945c6a14d..28bf08eba303e2b2d3cc18d26f7631a6cd4b7273 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -19,14 +19,16 @@
 #pragma hdrstop
 #endif
 
 #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"
 
 #include "wx/image.h"
 #include "wx/log.h"
 #include "wx/txtstrm.h"
 

-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-

 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------


@@ -37,8 +39,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

-  //#include <stream.h> // for cout
-

 void Skip_Comment(wxInputStream &stream)
 {
   wxString line;
 void Skip_Comment(wxInputStream &stream)
 {
   wxString line;


@@ -90,7 +90,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     Skip_Comment(buf_stream); 
     text_stream >> maxval;
 
     Skip_Comment(buf_stream); 
     text_stream >> maxval;
 

-    //cout << width << " " << height << " " << maxval << endl;
+    //cout << line << " " << width << " " << height << " " << maxval << endl;

     image->Create( width, height );
     unsigned char *ptr = image->GetData();
     if (!ptr)
     image->Create( width, height );
     unsigned char *ptr = image->GetData();
     if (!ptr)


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

-    if (c=='3') // Ascii RBG
+   if (c=='3') // Ascii RBG

       { 
        wxUint32 value, size=3*width*height;
        for (wxUint32 i=0; i<size; ++i)
       { 
        wxUint32 value, size=3*width*height;
        for (wxUint32 i=0; i<size; ++i)


@@ -158,4 +158,4 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

-
+#endif // wxUSE_PNM