check that filename pointer is non-NULL before using it, not after (coverity warning...

[wxWidgets.git] / src / jpeg / jdhuff.h

diff --git a/src/jpeg/jdhuff.h b/src/jpeg/jdhuff.h
index e95ea05f8b93c920716eec162c2ed98c7cc2c4e7..9e9e87daeccf201374417929a614f77cb012669e 100644 (file)
--- a/src/jpeg/jdhuff.h
+++ b/src/jpeg/jdhuff.h
@@ -47,7 +47,7 @@ typedef struct {
 
 /* Expand a Huffman table definition into the derived format */
 EXTERN(void) jpeg_make_d_derived_tbl
 
 /* Expand a Huffman table definition into the derived format */
 EXTERN(void) jpeg_make_d_derived_tbl

-       JPP((j_decompress_ptr cinfo, boolean isDC, int tblno,
+       JPP((j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,

             d_derived_tbl ** pdtbl));
 
 
             d_derived_tbl ** pdtbl));
 
 


@@ -151,7 +151,7 @@ typedef struct {            /* Bitreading working state within an MCU */
        (bits_left -= (nbits))
 
 /* Load up the bit buffer to a depth of at least nbits */
        (bits_left -= (nbits))
 
 /* Load up the bit buffer to a depth of at least nbits */

-EXTERN(boolean) jpeg_fill_bit_buffer
+EXTERN(wxjpeg_boolean) jpeg_fill_bit_buffer

        JPP((bitread_working_state * state, register bit_buf_type get_buffer,
             register int bits_left, int nbits));
 
        JPP((bitread_working_state * state, register bit_buf_type get_buffer,
             register int bits_left, int nbits));