replaced T() makro with wxT() due to namespace probs, _T() exists, too

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 75a0b49d79c3eaca2a8eecd85fbc1a7945c6a14d..d29174929cb03384f20ef00a3630d1bd43fa5c47 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,14 +39,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

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

 void Skip_Comment(wxInputStream &stream)
 {
   wxString line;
   wxTextInputStream text_stream(stream);
 
 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);
     {
       text_stream >> line;
       Skip_Comment(stream);


@@ -68,19 +68,19 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     wxTextInputStream text_stream(buf_stream);
 
     Skip_Comment(buf_stream);
     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)
       {
 
     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;
        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;
        return FALSE;

-      case _T('3'): case _T('6'): break;
+      case wxT('3'): case wxT('6'): break;

        default :
        default :

-       wxLogError(_T("Loading PNM image : file not recognized."));
+       wxLogError(wxT("Loading PNM image : file not recognized."));

        return FALSE;
       }
 
        return FALSE;
       }
 


@@ -90,16 +90,16 @@ 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)
     {

-        wxLogError( _T("Cannot allocate RAM for RGB data in PNM file.") );
+        wxLogError( wxT("Cannot allocate RAM for RGB data in PNM file.") );

        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)


@@ -111,7 +111,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 
            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
              {
 
            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
              {

-               wxLogError(_T("Loading PNM image : file seems truncated."));
+               wxLogError(wxT("Loading PNM image : file seems truncated."));

                return FALSE;
              }
          }
                return FALSE;
              }
          }


@@ -143,10 +143,10 @@ bool wxPNMHandler::CanRead( wxInputStream& stream )
 
     Skip_Comment(stream);
 
 
     Skip_Comment(stream);
 

-    if (stream.GetC()==_T('P'))
+    if (stream.GetC()==wxT('P'))

       switch (stream.GetC())
        {
       switch (stream.GetC())
        {

-       case _T('3'): case _T('6'):
+       case wxT('3'): case wxT('6'):

          stream.SeekI(pos);
          return TRUE;
        }
          stream.SeekI(pos);
          return TRUE;
        }


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

-
+#endif // wxUSE_PNM