X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38755449339718307f594d0c92f7d37ce56c908c..0ded6bb695f82a0b98d0862ec6870fc5c6cb8b97:/src/common/imagtiff.cpp diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp index c030a83c84..182a16f33a 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -37,6 +37,12 @@ extern "C" #include "wx/intl.h" #include "wx/module.h" +#ifdef __WATCOMC__ +#ifdef LINKAGEMODE +#undef LINKAGEMODE +#define LINKAGEMODE __cdecl +#endif +#endif //----------------------------------------------------------------------------- // wxTIFFHandler //----------------------------------------------------------------------------- @@ -45,8 +51,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler) static tsize_t LINKAGEMODE _tiffNullProc(thandle_t WXUNUSED(handle), - tdata_t WXUNUSED(buf), - tsize_t WXUNUSED(size)) + tdata_t WXUNUSED(buf), + tsize_t WXUNUSED(size)) { return (tsize_t) -1; } @@ -329,13 +335,13 @@ bool wxTIFFHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbo unsigned char *ptr = image->GetData(); for (int row = 0; row < image->GetHeight(); row++) { - if (buf) - memcpy(buf, ptr, image->GetWidth()); + if (buf) + memcpy(buf, ptr, image->GetWidth()); - if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0) + if (TIFFWriteScanline(tif, buf ? buf : ptr, (uint32)row, 0) < 0) { - if (verbose) - wxLogError( _("TIFF: Error writing image.") ); + if (verbose) + wxLogError( _("TIFF: Error writing image.") ); TIFFClose( tif ); if (buf)