Warning fix.

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

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 1dfefaf7461023f62b31a61202794e5bcac00b8c..86884d7d09f487f2fb7a791fb88a329860ebef63 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagpnm.cpp
+// Name:        src/common/imagpnm.cpp

 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Copyright:   (c) Sylvain Bougnoux

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#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"
 


@@ -19,7 +15,6 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#  include "wx/setup.h"

 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM
 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM


@@ -68,17 +63,13 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     switch (c)
     {
 
     switch (c)
     {

-        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;
+        case wxT('2'): // ASCII Grey
+        case wxT('3'): // ASCII RGB
+        case wxT('5'): // RAW Grey
+        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


@@ -94,11 +85,28 @@ 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=='2') // Ascii GREY
+    {
+        wxUint32 value, size=width*height;
+        for (wxUint32 i=0; i<size; ++i)
+        {
+            value=text_stream.Read32();
+            *ptr++=(unsigned char)value; // R
+            *ptr++=(unsigned char)value; // G
+            *ptr++=(unsigned char)value; // B
+            if ( !buf_stream )
+            {
+                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                return false;
+            }
+        }
+    }
+    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)
           {


@@ -110,14 +118,31 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             if ( !buf_stream )
               {
                 if (verbose) wxLogError(_("PNM: File seems truncated."));
             if ( !buf_stream )
               {
                 if (verbose) wxLogError(_("PNM: File seems truncated."));

-                return FALSE;
+                return false;

               }
           }
               }
           }

-      }
+    }
+    if (c=='5') // Raw GREY
+    {
+        wxUint32 size=width*height;
+        unsigned char value;
+        for (wxUint32 i=0; i<size; ++i)
+        {
+            buf_stream.Read(&value,1);
+            *ptr++=value; // R
+            *ptr++=value; // G
+            *ptr++=value; // B
+            if ( !buf_stream )
+            {
+                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 );
 

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

 
     const wxStreamError err = buf_stream.GetLastError();
     return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;
 
     const wxStreamError err = buf_stream.GetLastError();
     return err == wxSTREAM_NO_ERROR || err == wxSTREAM_EOF;


@@ -142,15 +167,17 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 
     if ( stream.GetC() == 'P' )
     {
 
     if ( stream.GetC() == 'P' )
     {

-        switch (stream.GetC())
+        switch ( stream.GetC() )

         {
         {

-            case '3':
-            case '6':
-                return TRUE;
+            case '2': // ASCII Grey
+            case '3': // ASCII RGB
+            case '5': // RAW Grey
+            case '6': // RAW RGB
+                return true;

         }
     }
 
         }
     }
 

-    return FALSE;
+    return false;

 }
 
 
 }