Don't delete model in views destructor as several

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

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

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

 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows 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,7 +63,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
 
     switch (c)
     {
 
     switch (c)
     {

-        case wxT('2'): // ASCII Grey 
+        case wxT('2'): // ASCII Grey

         case wxT('3'): // ASCII RGB
         case wxT('5'): // RAW Grey
         case wxT('6'): break;
         case wxT('3'): // ASCII RGB
         case wxT('5'): // RAW Grey
         case wxT('6'): break;


@@ -94,14 +89,14 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     }
 
 
     }
 
 

-    if (c=='2') // Ascii GREY 
-    {    
+    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
         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; // G

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


@@ -110,8 +105,8 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             }
         }
     }
             }
         }
     }

-   if (c=='3') // Ascii RBG
-      {
+    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)
           {


@@ -126,9 +121,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
                 return false;
               }
           }
                 return false;
               }
           }

-      }
-   if (c=='5') // Raw GREY
-    {    
+    }
+    if (c=='5') // Raw GREY
+    {

         wxUint32 size=width*height;
         unsigned char value;
         for (wxUint32 i=0; i<size; ++i)
         wxUint32 size=width*height;
         unsigned char value;
         for (wxUint32 i=0; i<size; ++i)


@@ -136,7 +131,7 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             buf_stream.Read(&value,1);
             *ptr++=value; // R
             *ptr++=value; // G
             buf_stream.Read(&value,1);
             *ptr++=value; // R
             *ptr++=value; // G

-            *ptr++=value; // B 
+            *ptr++=value; // B

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


@@ -172,10 +167,12 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 
     if ( stream.GetC() == 'P' )
     {
 
     if ( stream.GetC() == 'P' )
     {

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

         {
         {

-            case '3':
-            case '6':
+            case '2': // ASCII Grey
+            case '3': // ASCII RGB
+            case '5': // RAW Grey
+            case '6': // RAW RGB

                 return true;
         }
     }
                 return true;
         }
     }