Unicode fixes and warnings cleanup

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 75a0b49d79c3eaca2a8eecd85fbc1a7945c6a14d..d5ca1fae4ddfa7a2e6075188680dd9fb297a9a7e 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"


@@ -19,45 +18,42 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/image.h"
+#ifndef WX_PRECOMP
+#  include "wx/setup.h"
+#endif
+
+#if wxUSE_IMAGE && wxUSE_PNM
+
+#include "wx/imagpnm.h"

 #include "wx/log.h"
 #include "wx/log.h"

+#include "wx/intl.h"

 #include "wx/txtstrm.h"
 
 #include "wx/txtstrm.h"
 

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

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

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)

-#endif

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 

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

 void Skip_Comment(wxInputStream &stream)
 {
 void Skip_Comment(wxInputStream &stream)
 {

-  wxString line;

   wxTextInputStream text_stream(stream);
 
   wxTextInputStream text_stream(stream);
 

-  if (stream.Peek()==_T('#')) 
+  if (stream.Peek()==wxT('#'))

     {
     {

-      text_stream >> line;
+      text_stream.ReadLine();

       Skip_Comment(stream);
     }
 }
 
       Skip_Comment(stream);
     }
 }
 

-bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSED(verbose) )
+bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )

 {
     wxUint32  width, height;
     wxUint16  maxval;
 {
     wxUint32  width, height;
     wxUint16  maxval;

-    wxString  line;

     char      c(0);
     char      c(0);

-    
+

     image->Destroy();
 
     /*
     image->Destroy();
 
     /*


@@ -68,53 +64,55 @@ 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."));
-       return FALSE;
-      case _T('5'):
-       wxLogError(_T("Loading Grey Raw PNM image is not yet implemented."));
-       return FALSE;
-      case _T('3'): case _T('6'): break;
-       default :
-       wxLogError(_T("Loading PNM image : file not recognized."));
-       return FALSE;
-      }
+    {
+        case wxT('2'):
+            if (verbose) wxLogError(_("Loading Grey Ascii PNM image is not yet implemented."));
+            return FALSE;
+        case wxT('5'):
+            if (verbose) wxLogError(_("Loading Grey Raw PNM image is not yet implemented."));
+            return FALSE;
+        case wxT('3'): 
+       case wxT('6'): break;
+        default:
+            if (verbose) wxLogError(_("PNM: File format is not recognized."));
+            return FALSE;
+    }

 
 

-    text_stream >> line; // for the \n
+    text_stream.ReadLine(); // for the \n

     Skip_Comment(buf_stream);
     text_stream >> width >> height ;
     Skip_Comment(buf_stream);
     text_stream >> width >> height ;

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

     text_stream >> maxval;
 
     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.") );
-       return FALSE;
+        if (verbose)
+           wxLogError( _("PNM: Couldn't allocate memory.") );
+        return FALSE;

     }
 
     }
 

-    if (c=='3') // Ascii RBG
-      { 
-       wxUint32 value, size=3*width*height;
-       for (wxUint32 i=0; i<size; ++i)
-         {
-           //this is very slow !!!
-           //I wonder how we can make any better ?
-           value=text_stream.Read32();
-           *ptr++=(unsigned char)value;
-
-           if (buf_stream.LastError()!=wxSTREAM_NOERROR)
-             {
-               wxLogError(_T("Loading PNM image : file seems truncated."));
-               return FALSE;
-             }
-         }
+   if (c=='3') // Ascii RBG
+      {
+        wxUint32 value, size=3*width*height;
+        for (wxUint32 i=0; i<size; ++i)
+          {
+            //this is very slow !!!
+            //I wonder how we can make any better ?
+            value=text_stream.Read32();
+            *ptr++=(unsigned char)value;
+
+            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
+              {
+                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                return FALSE;
+              }
+          }

       }
     if (c=='6') // Raw RGB
       buf_stream.Read( ptr, 3*width*height );
       }
     if (c=='6') // Raw RGB
       buf_stream.Read( ptr, 3*width*height );


@@ -127,9 +125,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
 {
     wxTextOutputStream text_stream(stream);
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
 {
     wxTextOutputStream text_stream(stream);

-    
-    //text_stream << "P6" << endl 
-    //<< image->GetWidth() << " " << image->GetHeight() << endl 
+
+    //text_stream << "P6" << endl
+    //<< image->GetWidth() << " " << image->GetHeight() << endl

     //<< "255" << endl;
     text_stream << "P6\n" << image->GetWidth() << " " << image->GetHeight() << "\n255\n";
     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
     //<< "255" << endl;
     text_stream << "P6\n" << image->GetWidth() << " " << image->GetHeight() << "\n255\n";
     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());


@@ -137,19 +135,22 @@ bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUS
     return (stream.LastError()==wxStream_NOERROR);
 }
 
     return (stream.LastError()==wxStream_NOERROR);
 }
 

-bool wxPNMHandler::CanRead( wxInputStream& stream )
+bool wxPNMHandler::DoCanRead( wxInputStream& stream )

 {
 {

-    off_t pos=stream.TellI();
+    off_t pos = stream.TellI();

 
     Skip_Comment(stream);
 
 
     Skip_Comment(stream);
 

-    if (stream.GetC()==_T('P'))
-      switch (stream.GetC())
-       {
-       case _T('3'): case _T('6'):
-         stream.SeekI(pos);
-         return TRUE;
-       }
+    if ( stream.GetC() == 'P' )
+    {
+        switch (stream.GetC())
+        {
+            case '3':
+            case '6':
+                stream.SeekI(pos);
+                return TRUE;
+        }
+    }

 
     stream.SeekI(pos);
     return FALSE;
 
     stream.SeekI(pos);
     return FALSE;


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

-
+#endif // wxUSE_PNM