compilation fixes for !wxUSE_FONTMAP

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

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


@@ -23,19 +22,18 @@
 #  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/log.h"

+#include "wx/intl.h"

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

-#if !USE_SHARED_LIBRARIES

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

-#endif

 
 #if wxUSE_STREAMS
 
 
 #if wxUSE_STREAMS
 


@@ -50,7 +48,7 @@ void Skip_Comment(wxInputStream &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;


@@ -69,18 +67,19 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
 
     switch (c)
     if (buf_stream.GetC()==wxT('P')) c=buf_stream.GetC();
 
     switch (c)

-      {
-      case wxT('2'):
-        wxLogError(wxT("Loading Grey Ascii PNM image is not yet implemented."));
-        return FALSE;
-      case wxT('5'):
-        wxLogError(wxT("Loading Grey Raw PNM image is not yet implemented."));
-        return FALSE;
-      case wxT('3'): case wxT('6'): break;
-        default :
-        wxLogError(wxT("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.ReadLine(); // for the \n
     Skip_Comment(buf_stream);
 
     text_stream.ReadLine(); // for the \n
     Skip_Comment(buf_stream);


@@ -93,7 +92,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool WXUNUSE
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {
     unsigned char *ptr = image->GetData();
     if (!ptr)
     {

-        wxLogError( wxT("Cannot allocate RAM for RGB data in PNM file.") );
+        if (verbose)
+           wxLogError( _("PNM: Couldn't allocate memory.") );

         return FALSE;
     }
 
         return FALSE;
     }
 


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

-                wxLogError(wxT("Loading PNM image : file seems truncated."));
+                if (verbose) wxLogError(_("PNM: File seems truncated."));

                 return FALSE;
               }
           }
                 return FALSE;
               }
           }