From 42ec5425b062744aedda5268e17876788d895609 Mon Sep 17 00:00:00 2001 From: malaterre Date: Sat, 5 Feb 2005 00:48:51 +0000 Subject: [PATCH] BUG: For some reason the Sun compiler produce incoherent warnings... Borland was complaining about uc vs int cast --- src/jdatadst.cxx | 4 ++-- src/jdatasrc.cxx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/jdatadst.cxx b/src/jdatadst.cxx index b0776553..6b405656 100644 --- a/src/jdatadst.cxx +++ b/src/jdatadst.cxx @@ -20,7 +20,7 @@ /* Expanded data destination object for stdio output */ extern "C" { - typedef int(*int_jpeg_compress_struct)(jpeg_compress_struct*); + typedef unsigned char(*uc_jpeg_compress_struct)(jpeg_compress_struct*); typedef void(*void_jpeg_compress_struct)(jpeg_compress_struct*); } @@ -165,7 +165,7 @@ jpeg_stdio_dest (j_compress_ptr cinfo, std::ofstream * outfile) dest = (my_dest_ptr) cinfo->dest; dest->pub.init_destination = reinterpret_cast(init_destination); - dest->pub.empty_output_buffer = reinterpret_cast(empty_output_buffer); + dest->pub.empty_output_buffer = reinterpret_cast(empty_output_buffer); dest->pub.term_destination = reinterpret_cast(term_destination); dest->outfile = outfile; } diff --git a/src/jdatasrc.cxx b/src/jdatasrc.cxx index a7c0a368..64a148d1 100644 --- a/src/jdatasrc.cxx +++ b/src/jdatasrc.cxx @@ -1,5 +1,5 @@ /* - * jdatasrc.c + * jdatasrc.cxx * * Copyright (C) 1994-1996, Thomas G. Lane. * This file is part of the Independent JPEG Group's software. @@ -19,7 +19,7 @@ /* Expanded data source object for stdio input */ extern "C" { - typedef int(*int_jpeg_decompress_struct)(jpeg_decompress_struct*); + typedef unsigned char(*uc_jpeg_decompress_struct)(jpeg_decompress_struct*); typedef void(*void_jpeg_decompress_struct)(jpeg_decompress_struct*); typedef void(*void_jpeg_decompress_struct_long)(jpeg_decompress_struct*,long); } @@ -221,7 +221,7 @@ jpeg_stdio_src (j_decompress_ptr cinfo, std::ifstream * infile, gdcm::JPEGFragme src = (my_src_ptr) cinfo->src; src->pub.init_source = reinterpret_cast(init_source); - src->pub.fill_input_buffer = reinterpret_cast(fill_input_buffer); + src->pub.fill_input_buffer = reinterpret_cast(fill_input_buffer); src->pub.skip_input_data = reinterpret_cast(skip_input_data); src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */ src->pub.term_source = reinterpret_cast(term_source); -- 2.46.2