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

Mutiple updates from SciTech for wxWindows including the following:

Browse Source 
1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kendall Bennett
2001-10-17 22:25:56 +00:00
parent 7361f176df
commit 19193a2c85
62 changed files with 1309 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/imagtiff.cpp
View File

@@ -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)