Skip to content

Commit

Permalink
- Fixing boolean compilation errors under Linux / MacOS, issue #48 at #…
Browse files Browse the repository at this point in the history
  • Loading branch information
DentonW committed Jan 7, 2017
1 parent 41fcabb commit 4a2d782
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions DevIL/src-IL/src/il_jpeg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ METHODDEF(void)
init_source (j_decompress_ptr cinfo)
{
iread_ptr src = (iread_ptr) cinfo->src;
src->start_of_file = TRUE;
src->start_of_file = (boolean)IL_TRUE;
}


Expand Down Expand Up @@ -253,7 +253,7 @@ fill_input_buffer (j_decompress_ptr cinfo)

src->pub.next_input_byte = src->buffer;
src->pub.bytes_in_buffer = nbytes;
src->start_of_file = IL_FALSE;
src->start_of_file = (boolean)IL_FALSE;

return (boolean)IL_TRUE;
}
Expand Down Expand Up @@ -334,13 +334,13 @@ ILboolean iLoadJpegInternal()

if ((result = setjmp(JpegJumpBuffer) == 0) != IL_FALSE) {
jpeg_create_decompress(&JpegInfo);
JpegInfo.do_block_smoothing = IL_TRUE;
JpegInfo.do_fancy_upsampling = IL_TRUE;
JpegInfo.do_block_smoothing = (boolean)IL_TRUE;
JpegInfo.do_fancy_upsampling = (boolean)IL_TRUE;

//jpeg_stdio_src(&JpegInfo, iGetFile());

devil_jpeg_read_init(&JpegInfo);
jpeg_read_header(&JpegInfo, IL_TRUE);
jpeg_read_header(&JpegInfo, (boolean)IL_TRUE);

result = ilLoadFromJpegStruct(&JpegInfo);

Expand Down Expand Up @@ -391,7 +391,7 @@ empty_output_buffer (j_compress_ptr cinfo)
iwrite(dest->buffer, 1, OUTPUT_BUF_SIZE);
dest->pub.next_output_byte = dest->buffer;
dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
return IL_TRUE;
return (boolean)IL_TRUE;
}

METHODDEF(void)
Expand Down Expand Up @@ -550,16 +550,16 @@ ILboolean iSaveJpegInternal()
} //EXIF not present in libjpeg...
#else*/
Type = Type;
JpegInfo.write_JFIF_header = TRUE;
JpegInfo.write_JFIF_header = (boolean)TRUE;
//#endif//IL_USE_JPEGLIB_UNMODIFIED

// Set the quality output
jpeg_set_quality(&JpegInfo, iGetInt(IL_JPG_QUALITY), IL_TRUE);
jpeg_set_quality(&JpegInfo, iGetInt(IL_JPG_QUALITY), (boolean)IL_TRUE);
// Sets progressive saving here
if (ilGetBoolean(IL_JPG_PROGRESSIVE))
jpeg_simple_progression(&JpegInfo);

jpeg_start_compress(&JpegInfo, IL_TRUE);
jpeg_start_compress(&JpegInfo, (boolean)IL_TRUE);

//row_stride = image_width * 3; // JSAMPLEs per row in image_buffer

Expand Down Expand Up @@ -970,7 +970,7 @@ ILboolean ilSaveFromJpegStruct(void *_JpegInfo)
JpegInfo->image_height = TempImage->Height;
JpegInfo->input_components = TempImage->Bpp; // # of color components per pixel

jpeg_start_compress(JpegInfo, IL_TRUE);
jpeg_start_compress(JpegInfo, (boolean)IL_TRUE);

//row_stride = image_width * 3; // JSAMPLEs per row in image_buffer

Expand Down

1 comment on commit 4a2d782

@MT2Dev
Copy link

@MT2Dev MT2Dev commented on 4a2d782 Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You forgot line 248, make it (boolean) too. Best regards.

Please sign in to comment.