fixes for the compilation warnings with Sun CC:
1. some fixes for "String literal to char * conversion" warnings (many more left in the *.xpm files) 2. fixes for "assignment of function to extern "C" function" 3. a few other miscellaneous ones git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -47,7 +47,10 @@ extern "C"
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxTIFFHandler,wxImageHandler)
|
||||
|
||||
static tsize_t TIFFLINKAGEMODE
|
||||
extern "C"
|
||||
{
|
||||
|
||||
tsize_t TIFFLINKAGEMODE
|
||||
_tiffNullProc(thandle_t WXUNUSED(handle),
|
||||
tdata_t WXUNUSED(buf),
|
||||
tsize_t WXUNUSED(size))
|
||||
@@ -55,7 +58,7 @@ _tiffNullProc(thandle_t WXUNUSED(handle),
|
||||
return (tsize_t) -1;
|
||||
}
|
||||
|
||||
static tsize_t TIFFLINKAGEMODE
|
||||
tsize_t TIFFLINKAGEMODE
|
||||
_tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
|
||||
{
|
||||
wxInputStream *stream = (wxInputStream*) handle;
|
||||
@@ -63,7 +66,7 @@ _tiffReadProc(thandle_t handle, tdata_t buf, tsize_t size)
|
||||
return stream->LastRead();
|
||||
}
|
||||
|
||||
static tsize_t TIFFLINKAGEMODE
|
||||
tsize_t TIFFLINKAGEMODE
|
||||
_tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
|
||||
{
|
||||
wxOutputStream *stream = (wxOutputStream*) handle;
|
||||
@@ -71,7 +74,7 @@ _tiffWriteProc(thandle_t handle, tdata_t buf, tsize_t size)
|
||||
return stream->LastWrite();
|
||||
}
|
||||
|
||||
static toff_t TIFFLINKAGEMODE
|
||||
toff_t TIFFLINKAGEMODE
|
||||
_tiffSeekIProc(thandle_t handle, toff_t off, int whence)
|
||||
{
|
||||
wxInputStream *stream = (wxInputStream*) handle;
|
||||
@@ -87,7 +90,7 @@ _tiffSeekIProc(thandle_t handle, toff_t off, int whence)
|
||||
return (toff_t)stream->SeekI( (off_t)off, mode );
|
||||
}
|
||||
|
||||
static toff_t TIFFLINKAGEMODE
|
||||
toff_t TIFFLINKAGEMODE
|
||||
_tiffSeekOProc(thandle_t handle, toff_t off, int whence)
|
||||
{
|
||||
wxOutputStream *stream = (wxOutputStream*) handle;
|
||||
@@ -103,20 +106,20 @@ _tiffSeekOProc(thandle_t handle, toff_t off, int whence)
|
||||
return (toff_t)stream->SeekO( (off_t)off, mode );
|
||||
}
|
||||
|
||||
static int TIFFLINKAGEMODE
|
||||
int TIFFLINKAGEMODE
|
||||
_tiffCloseProc(thandle_t WXUNUSED(handle))
|
||||
{
|
||||
return 0; // ?
|
||||
}
|
||||
|
||||
static toff_t TIFFLINKAGEMODE
|
||||
toff_t TIFFLINKAGEMODE
|
||||
_tiffSizeProc(thandle_t handle)
|
||||
{
|
||||
wxStreamBase *stream = (wxStreamBase*) handle;
|
||||
return (toff_t) stream->GetSize();
|
||||
}
|
||||
|
||||
static int TIFFLINKAGEMODE
|
||||
int TIFFLINKAGEMODE
|
||||
_tiffMapProc(thandle_t WXUNUSED(handle),
|
||||
tdata_t* WXUNUSED(pbase),
|
||||
toff_t* WXUNUSED(psize))
|
||||
@@ -124,13 +127,15 @@ _tiffMapProc(thandle_t WXUNUSED(handle),
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void TIFFLINKAGEMODE
|
||||
void TIFFLINKAGEMODE
|
||||
_tiffUnmapProc(thandle_t WXUNUSED(handle),
|
||||
tdata_t WXUNUSED(base),
|
||||
toff_t WXUNUSED(size))
|
||||
{
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
TIFF*
|
||||
TIFFwxOpen(wxInputStream &stream, const char* name, const char* mode)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user