make JPEG callbacks extern "C" to fix Sun CC warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
291b0f5b14
commit
b1f8fd3b41
@ -100,6 +100,9 @@ typedef struct {
|
||||
|
||||
typedef wx_source_mgr * wx_src_ptr;
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
CPP_METHODDEF(void) wx_init_source ( j_decompress_ptr WXUNUSED(cinfo) )
|
||||
{
|
||||
}
|
||||
@ -206,6 +209,8 @@ void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
|
||||
src->pub.term_source = wx_term_source;
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
|
||||
{
|
||||
register int k = 255 - cmyk[3];
|
||||
@ -321,6 +326,9 @@ typedef wx_destination_mgr * wx_dest_ptr;
|
||||
|
||||
#define OUTPUT_BUF_SIZE 4096 /* choose an efficiently fwrite'able size */
|
||||
|
||||
extern "C"
|
||||
{
|
||||
|
||||
CPP_METHODDEF(void) wx_init_destination (j_compress_ptr cinfo)
|
||||
{
|
||||
wx_dest_ptr dest = (wx_dest_ptr) cinfo->dest;
|
||||
@ -369,6 +377,8 @@ GLOBAL(void) wx_jpeg_io_dest (j_compress_ptr cinfo, wxOutputStream& outfile)
|
||||
dest->stream = &outfile;
|
||||
}
|
||||
|
||||
} // extern "C"
|
||||
|
||||
bool wxJPEGHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbose )
|
||||
{
|
||||
struct jpeg_compress_struct cinfo;
|
||||
|
Loading…
Reference in New Issue
Block a user