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

Applied patch [ 740071 ] Make tiff errors/warnings use wxLog functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-05-21 18:25:24 +00:00
parent 732c0bfdff
commit 0fc7f695ce
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/imagtiff.h
View File

@@ -25,13 +25,7 @@
class WXDLLEXPORT wxTIFFHandler: public wxImageHandler class WXDLLEXPORT wxTIFFHandler: public wxImageHandler
{ {
public: public:
inline wxTIFFHandler() wxTIFFHandler();
{
m_name = wxT("TIFF file");
m_extension = wxT("tif");
m_type = wxBITMAP_TYPE_TIF;
m_mime = wxT("image/tiff");
}
#if wxUSE_STREAMS #if wxUSE_STREAMS
virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 ); virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );

26
src/common/imagtiff.cpp
View File

@@ -136,6 +136,22 @@ _tiffUnmapProc(thandle_t WXUNUSED(handle),
{ {
} }
static void
TIFFwxWarningHandler(const char* module, const char* fmt, va_list ap)
{
if (module != NULL)
wxLogWarning(_("tiff module: %s"), module);
wxLogWarning((wxChar *) fmt, ap);
}
static void
TIFFwxErrorHandler(const char* module, const char* fmt, va_list ap)
{
if (module != NULL)
wxLogError(_("tiff module: %s"), module);
wxVLogError((wxChar *) fmt, ap);
}
} // extern "C" } // extern "C"
TIFF* TIFF*
@@ -162,6 +178,16 @@ TIFFwxOpen(wxOutputStream &stream, const char* name, const char* mode)
return tif; return tif;
} }
wxTIFFHandler::wxTIFFHandler()
{
m_name = wxT("TIFF file");
m_extension = wxT("tif");
m_type = wxBITMAP_TYPE_TIF;
m_mime = wxT("image/tiff");
TIFFSetWarningHandler((TIFFErrorHandler) TIFFwxWarningHandler);
TIFFSetErrorHandler((TIFFErrorHandler) TIFFwxErrorHandler);
}
bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index ) bool wxTIFFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int index )
{ {
if (index == -1) if (index == -1)