Implement wxIcon::LoadFile by defering to wxBitmap implementation instead of creating...

[wxWidgets.git] / src / jpeg / jdapistd.c

diff --git a/src/jpeg/jdapistd.c b/src/jpeg/jdapistd.c
index c8e3fa0c35d2cc0f7b63de5c3d4ab6aa4c68c030..9c995b4d8752e346c97e8e8e24ef8de926104857 100644 (file)
--- a/src/jpeg/jdapistd.c
+++ b/src/jpeg/jdapistd.c
@@ -20,7 +20,7 @@
 
 
 /* Forward declarations */
 
 
 /* Forward declarations */

-LOCAL(boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
+LOCAL(wxjpeg_boolean) output_pass_setup JPP((j_decompress_ptr cinfo));

 
 
 /*
 
 
 /*


@@ -34,7 +34,7 @@ LOCAL(boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
  * a suspending data source is used.
  */
 
  * a suspending data source is used.
  */
 

-GLOBAL(boolean)
+GLOBAL(wxjpeg_boolean)

 jpeg_start_decompress (j_decompress_ptr cinfo)
 {
   if (cinfo->global_state == DSTATE_READY) {
 jpeg_start_decompress (j_decompress_ptr cinfo)
 {
   if (cinfo->global_state == DSTATE_READY) {


@@ -91,7 +91,7 @@ jpeg_start_decompress (j_decompress_ptr cinfo)
  *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
  */
 
  *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
  */
 

-LOCAL(boolean)
+LOCAL(wxjpeg_boolean)

 output_pass_setup (j_decompress_ptr cinfo)
 {
   if (cinfo->global_state != DSTATE_PRESCAN) {
 output_pass_setup (j_decompress_ptr cinfo)
 {
   if (cinfo->global_state != DSTATE_PRESCAN) {


@@ -224,7 +224,7 @@ jpeg_read_raw_data (j_decompress_ptr cinfo, JSAMPIMAGE data,
  * Initialize for an output pass in buffered-image mode.
  */
 
  * Initialize for an output pass in buffered-image mode.
  */
 

-GLOBAL(boolean)
+GLOBAL(wxjpeg_boolean)

 jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
 {
   if (cinfo->global_state != DSTATE_BUFIMAGE &&
 jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
 {
   if (cinfo->global_state != DSTATE_BUFIMAGE &&


@@ -249,7 +249,7 @@ jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
  * a suspending data source is used.
  */
 
  * a suspending data source is used.
  */
 

-GLOBAL(boolean)
+GLOBAL(wxjpeg_boolean)

 jpeg_finish_output (j_decompress_ptr cinfo)
 {
   if ((cinfo->global_state == DSTATE_SCANNING ||
 jpeg_finish_output (j_decompress_ptr cinfo)
 {
   if ((cinfo->global_state == DSTATE_SCANNING ||