changed wxCreateGreyedImage() to respect the original image mask

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 3c34cbc82236a10ee4bfc8df87531ec1fe943e29..1fa96b89a081a764db5422a86176509028c06e60 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
-*/
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#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"


@@ -40,12 +39,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxPNMHandler,wxImageHandler)
 
 void Skip_Comment(wxInputStream &stream)
 {
 
 void Skip_Comment(wxInputStream &stream)
 {

-  wxTextInputStream text_stream(stream);
+    wxTextInputStream text_stream(stream);

 
 

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

     {
     {

-      text_stream.ReadLine();
-      Skip_Comment(stream);
+        text_stream.ReadLine();
+        Skip_Comment(stream);

     }
 }
 
     }
 }
 


@@ -71,15 +70,15 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     {
         case wxT('2'):
             if (verbose) wxLogError(_("Loading Grey Ascii PNM image is not yet implemented."));
     {
         case wxT('2'):
             if (verbose) wxLogError(_("Loading Grey Ascii PNM image is not yet implemented."));

-            return FALSE;
+            return false;

         case wxT('5'):
             if (verbose) wxLogError(_("Loading Grey Raw PNM image is not yet implemented."));
         case wxT('5'):
             if (verbose) wxLogError(_("Loading Grey Raw PNM image is not yet implemented."));

-            return FALSE;
-        case wxT('3'): 
-       case wxT('6'): break;
+            return false;
+        case wxT('3'):
+        case wxT('6'): break;

         default:
             if (verbose) wxLogError(_("PNM: File format is not recognized."));
         default:
             if (verbose) wxLogError(_("PNM: File format is not recognized."));

-            return FALSE;
+            return false;

     }
 
     text_stream.ReadLine(); // for the \n
     }
 
     text_stream.ReadLine(); // for the \n


@@ -95,7 +94,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     {
         if (verbose)
            wxLogError( _("PNM: Couldn't allocate memory.") );
     {
         if (verbose)
            wxLogError( _("PNM: Couldn't allocate memory.") );

-        return FALSE;
+        return false;

     }
 
    if (c=='3') // Ascii RBG
     }
 
    if (c=='3') // Ascii RBG


@@ -108,19 +107,20 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             value=text_stream.Read32();
             *ptr++=(unsigned char)value;
 
             value=text_stream.Read32();
             *ptr++=(unsigned char)value;
 

-            if (buf_stream.LastError()!=wxSTREAM_NOERROR)
+            if ( !buf_stream )

               {
                 if (verbose) wxLogError(_("PNM: File seems truncated."));
               {
                 if (verbose) wxLogError(_("PNM: File seems truncated."));

-                return FALSE;
+                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 );
 

-    image->SetMask( FALSE );
+    image->SetMask( false );

 
 

-    return (buf_stream.LastError()==wxStream_NOERROR || buf_stream.LastError()==wxStream_EOF);
+    const wxStreamError err = buf_stream.GetLastError();
+    return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;

 }
 
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )
 }
 
 bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUSED(verbose) )


@@ -130,16 +130,14 @@ bool wxPNMHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool WXUNUS
     //text_stream << "P6" << endl
     //<< image->GetWidth() << " " << image->GetHeight() << endl
     //<< "255" << endl;
     //text_stream << "P6" << endl
     //<< image->GetWidth() << " " << image->GetHeight() << endl
     //<< "255" << endl;

-    text_stream << "P6\n" << image->GetWidth() << " " << image->GetHeight() << "\n255\n";
+    text_stream << wxT("P6\n") << image->GetWidth() << wxT(" ") << image->GetHeight() << wxT("\n255\n");

     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
 
     stream.Write(image->GetData(),3*image->GetWidth()*image->GetHeight());
 

-    return (stream.LastError()==wxStream_NOERROR);
+    return stream.IsOk();

 }
 
 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,13 +146,11 @@ 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;

 }
 
 
 }