Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistently handle wxImage Load_Verbose flag in LoadFile

Browse Source 
In wxImage, it is possible to set the Load_Verbose flag (default) if
messages are to be shown to the user in popup message boxes (via
wxLogError and wxLogWarning).

Unsetting this flag is supposed to remove these message boxes but in
practice, this was only applied in the function DoLoad() while other
messages could be issued earlier in overloads of the function LoadFile().

This commit checks if Load_Verbose is set or not and behaves accordingly
in LoadFile() overloads so that all messages can be suppressed.

See https://github.com/wxWidgets/wxWidgets/pull/920
This commit is contained in:
F
2018-09-05 23:24:18 +02:00
committed by VZ
parent 236c79f809
commit 32af4c8727
1 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/common/image.cpp
View File

@@ -2818,16 +2818,22 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
wxImageHandler *handler; wxImageHandler *handler;
// do we issue warning/error messages?
const bool verbose = M_IMGDATA->m_loadFlags & Load_Verbose;
if ( type == wxBITMAP_TYPE_ANY ) if ( type == wxBITMAP_TYPE_ANY )
{ {
if ( !stream.IsSeekable() ) if ( !stream.IsSeekable() )
{ {
// The error message about image data format being unknown below if ( verbose )
// would be misleading in this case as we are not even going to try {
// any handlers because CanRead() never does anything for not // The error message about image data format being unknown below
// seekable stream, so try to be more precise here. // would be misleading in this case as we are not even going to try
wxLogError(_("Can't automatically determine the image format " // any handlers because CanRead() never does anything for not
"for non-seekable input.")); // seekable stream, so try to be more precise here.
wxLogError(_("Can't automatically determine the image format "
"for non-seekable input."));
}
return false; return false;
} }
@@ -2841,7 +2847,10 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
return true; return true;
} }
wxLogWarning( _("Unknown image data format.") ); if ( verbose )
{
wxLogWarning( _("Unknown image data format.") );
}
return false; return false;
} }
@@ -2850,13 +2859,19 @@ bool wxImage::LoadFile( wxInputStream& stream, wxBitmapType type, int index )
handler = FindHandler(type); handler = FindHandler(type);
if ( !handler ) if ( !handler )
{ {
wxLogWarning( _("No image handler for type %d defined."), type ); if ( verbose )
{
wxLogWarning( _("No image handler for type %d defined."), type );
}
return false; return false;
} }
if ( stream.IsSeekable() && !handler->CanRead(stream) ) if ( stream.IsSeekable() && !handler->CanRead(stream) )
{ {
wxLogError(_("This is not a %s."), handler->GetName()); if ( verbose )
{
wxLogError(_("This is not a %s."), handler->GetName());
}
return false; return false;
} }
@@ -2871,15 +2886,24 @@ bool wxImage::LoadFile( wxInputStream& stream, const wxString& mimetype, int ind
wxImageHandler *handler = FindHandlerMime(mimetype); wxImageHandler *handler = FindHandlerMime(mimetype);
// do we issue warning/error messages?
const bool verbose = M_IMGDATA->m_loadFlags & Load_Verbose;
if ( !handler ) if ( !handler )
{ {
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() ); if ( verbose )
{
wxLogWarning( _("No image handler for type %s defined."), mimetype.GetData() );
}
return false; return false;
} }
if ( stream.IsSeekable() && !handler->CanRead(stream) ) if ( stream.IsSeekable() && !handler->CanRead(stream) )
{ {
wxLogError(_("Image is not of type %s."), mimetype); if ( verbose )
{
wxLogError(_("Image is not of type %s."), mimetype);
}
return false; return false;
} }