Do a sanity check before reading. Otherwise, if trying to read a duff image file,

the app can abort if you pass a specific image type, but simply show an error
message if you pass wxBITMAP_TYPE_ANY.


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

src/common/image.cpp

@@ -1554,6 +1554,12 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
         return false;
     }
 
+    if (!handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %d."), type);
+        return false;
+    }
+    else
         return handler->LoadFile(this, stream, true/*verbose*/, index);
 }
 
@@ -1572,6 +1578,12 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
         return false;
     }
 
+    if (!handler->CanRead(stream))
+    {
+        wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
+        return false;
+    }
+    else
         return handler->LoadFile( this, stream, true/*verbose*/, index );
 }