Document wxTreeCtrl::GetItemFont() behaviour for items without font.

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

diff --git a/src/jpeg/jdapimin.c b/src/jpeg/jdapimin.c
index cadb59fce3aa1cc239e86c592774cc500e109613..5c8474f018819bf886a62b718c7601b5f4ad5a5e 100644 (file)
--- a/src/jpeg/jdapimin.c
+++ b/src/jpeg/jdapimin.c
@@ -238,7 +238,7 @@ default_decompress_parms (j_decompress_ptr cinfo)
  */
 
 GLOBAL(int)
  */
 
 GLOBAL(int)

-jpeg_read_header (j_decompress_ptr cinfo, boolean require_image)
+jpeg_read_header (j_decompress_ptr cinfo, wxjpeg_boolean require_image)

 {
   int retcode;
 
 {
   int retcode;
 


@@ -330,7 +330,7 @@ jpeg_consume_input (j_decompress_ptr cinfo)
  * Have we finished reading the input file?
  */
 
  * Have we finished reading the input file?
  */
 

-GLOBAL(boolean)
+GLOBAL(wxjpeg_boolean)

 jpeg_input_complete (j_decompress_ptr cinfo)
 {
   /* Check for valid jpeg object */
 jpeg_input_complete (j_decompress_ptr cinfo)
 {
   /* Check for valid jpeg object */


@@ -345,7 +345,7 @@ jpeg_input_complete (j_decompress_ptr cinfo)
  * Is there more than one scan?
  */
 
  * Is there more than one scan?
  */
 

-GLOBAL(boolean)
+GLOBAL(wxjpeg_boolean)

 jpeg_has_multiple_scans (j_decompress_ptr cinfo)
 {
   /* Only valid after jpeg_read_header completes */
 jpeg_has_multiple_scans (j_decompress_ptr cinfo)
 {
   /* Only valid after jpeg_read_header completes */


@@ -365,7 +365,7 @@ jpeg_has_multiple_scans (j_decompress_ptr cinfo)
  * a suspending data source is used.
  */
 
  * a suspending data source is used.
  */
 

-GLOBAL(boolean)
+GLOBAL(wxjpeg_boolean)

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