missing commit

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

diff --git a/src/jpeg/jdmainct.c b/src/jpeg/jdmainct.c
index a188bef0e4bdc2aed635dda8bdfa6b6c830ddc2a..cd55e8ce1c51f559da5a591ac5c4ad7308845fe1 100644 (file)
--- a/src/jpeg/jdmainct.c
+++ b/src/jpeg/jdmainct.c
@@ -119,7 +119,7 @@ typedef struct {
   /* Pointer to allocated workspace (M or M+2 row groups). */
   JSAMPARRAY buffer[MAX_COMPONENTS];
 
   /* Pointer to allocated workspace (M or M+2 row groups). */
   JSAMPARRAY buffer[MAX_COMPONENTS];
 

-  boolean buffer_full;         /* Have we gotten an iMCU row from decoder? */
+  wxjpeg_boolean buffer_full;          /* Have we gotten an iMCU row from decoder? */

   JDIMENSION rowgroup_ctr;     /* counts row groups output to postprocessor */
 
   /* Remaining fields are only used in the context case. */
   JDIMENSION rowgroup_ctr;     /* counts row groups output to postprocessor */
 
   /* Remaining fields are only used in the context case. */


@@ -481,7 +481,7 @@ process_data_crank_post (j_decompress_ptr cinfo,
  */
 
 GLOBAL(void)
  */
 
 GLOBAL(void)

-jinit_d_main_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_main_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)

 {
   my_main_ptr main;
   int ci, rgroup, ngroups;
 {
   my_main_ptr main;
   int ci, rgroup, ngroups;