Added chapter on collection and container classes to contents

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 9e4921bd8760e0776dafc332c9b1abe2ca02bb01..d8117cb9da270b20254eacedaa5792ab2d7754f4 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -317,7 +317,7 @@ wxImage wxImage::Mirror( bool horizontally ) const
         for (long i = 0; i < height; i++)
         {
             target_data = data + 3*width*(height-1-i);
         for (long i = 0; i < height; i++)
         {
             target_data = data + 3*width*(height-1-i);

-            memcpy( target_data, source_data, 3*width );
+            memcpy( target_data, source_data, (size_t)3*width );

             source_data += 3*width;
         }
     }
             source_data += 3*width;
         }
     }


@@ -739,9 +739,9 @@ bool wxImage::SaveFile( const wxString& filename, int type )
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, type);
     }
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, type);
     }

-    else

 #endif // wxUSE_STREAMS
 #endif // wxUSE_STREAMS

-        return FALSE;
+
+    return FALSE;

 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
 }
 
 bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )


@@ -754,9 +754,9 @@ bool wxImage::SaveFile( const wxString& filename, const wxString& mimetype )
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, mimetype);
     }
         wxBufferedOutputStream bstream( stream );
         return SaveFile(bstream, mimetype);
     }

-    else

 #endif // wxUSE_STREAMS
 #endif // wxUSE_STREAMS

-        return FALSE;
+
+    return FALSE;

 }
 
 bool wxImage::CanRead( const wxString &name )
 }
 
 bool wxImage::CanRead( const wxString &name )