added raw RGB support and colour normalization to PNM handler

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 693a7236306a353eeba15a72d9b3e299304c8000..128ff14de188445c229234a1c6405fa338aa5f13 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -156,6 +156,10 @@ wxX11:
 2.8.5
 -----
 
 2.8.5
 -----
 

+All (GUI):
+
+- Added raw RGB support and colour normalization to PNM handler (Ray Johnston)
+

 wxMSW:
 
 - Correct problem with page setup dialog when using landscape mode
 wxMSW:
 
 - Correct problem with page setup dialog when using landscape mode

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index 4c1a6205c9fc967041cd44d17c69c7960af090e3..85fbdc08a9b45991ff8b825284cea2129d3694c9 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -96,6 +96,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         for (wxUint32 i=0; i<size; ++i)
         {
             value=text_stream.Read32();
         for (wxUint32 i=0; i<size; ++i)
         {
             value=text_stream.Read32();

+            if ( maxval != 255 )
+                value = (255 * value)/maxval;

             *ptr++=(unsigned char)value; // R
             *ptr++=(unsigned char)value; // G
             *ptr++=(unsigned char)value; // B
             *ptr++=(unsigned char)value; // R
             *ptr++=(unsigned char)value; // G
             *ptr++=(unsigned char)value; // B


@@ -114,6 +116,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             //this is very slow !!!
             //I wonder how we can make any better ?
             value=text_stream.Read32();
             //this is very slow !!!
             //I wonder how we can make any better ?
             value=text_stream.Read32();

+            if ( maxval != 255 )
+                value = (255 * value)/maxval;

             *ptr++=(unsigned char)value;
 
             if ( !buf_stream )
             *ptr++=(unsigned char)value;
 
             if ( !buf_stream )


@@ -130,6 +134,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         for (wxUint32 i=0; i<size; ++i)
         {
             buf_stream.Read(&value,1);
         for (wxUint32 i=0; i<size; ++i)
         {
             buf_stream.Read(&value,1);

+            if ( maxval != 255 )
+                value = (255 * value)/maxval;

             *ptr++=value; // R
             *ptr++=value; // G
             *ptr++=value; // B
             *ptr++=value; // R
             *ptr++=value; // G
             *ptr++=value; // B


@@ -140,8 +146,16 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             }
         }
     }
             }
         }
     }

-    if (c=='6') // Raw RGB
-      buf_stream.Read( ptr, 3*width*height );
+
+    if ( c=='6' ) // Raw RGB
+    {
+        buf_stream.Read(ptr, 3*width*height);
+        if ( maxval != 255 )
+        {
+            for ( unsigned i = 0; i < 3*width*height; i++ )
+                ptr[i] = (255 * ptr[i])/maxval;
+        }
+    }

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