Only do sanity check if the stream is seekable, otherwise it'll always fail
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1594,7 +1594,7 @@ bool wxImage::LoadFile( wxInputStream& stream, long type, int index )
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!handler->CanRead(stream))
|
if (stream.IsSeekable() && !handler->CanRead(stream))
|
||||||
{
|
{
|
||||||
wxLogError(_("Image file is not of type %d."), type);
|
wxLogError(_("Image file is not of type %d."), type);
|
||||||
return false;
|
return false;
|
||||||
@@ -1618,7 +1618,7 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!handler->CanRead(stream))
|
if (stream.IsSeekable() && !handler->CanRead(stream))
|
||||||
{
|
{
|
||||||
wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
|
wxLogError(_("Image file is not of type %s."), (const wxChar*) mimetype);
|
||||||
return false;
|
return false;
|
||||||
|
Reference in New Issue
Block a user