From a96a0ae362070d8e99587c6d658c1e11895c717c Mon Sep 17 00:00:00 2001 From: "Andreas K. Huettel (dilfridge)" Date: Thu, 18 Sep 2014 22:43:35 +0200 Subject: [PATCH] type conversion fixes for jpeg-9 compatibility backport of 867aa217e6bcb543ea61c61f10088042d632bd07 from libreoffice-4-3 branch --- vcl/source/filter/jpeg/JpegReader.cxx | 6 +++--- vcl/source/filter/jpeg/JpegWriter.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index 89f9028..9014d00 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -71,7 +71,7 @@ extern "C" void init_source (j_decompress_ptr cinfo) * but we don't clear the input buffer. * This is correct behavior for reading a series of images from one source. */ - source->start_of_file = sal_True; + source->start_of_file = TRUE; } long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize ) @@ -119,9 +119,9 @@ extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo) source->pub.next_input_byte = source->buffer; source->pub.bytes_in_buffer = nbytes; - source->start_of_file = sal_False; + source->start_of_file = FALSE; - return sal_True; + return TRUE; } extern "C" void skip_input_data (j_decompress_ptr cinfo, long numberOfBytes) diff --git a/vcl/source/filter/jpeg/JpegWriter.cxx b/vcl/source/filter/jpeg/JpegWriter.cxx index 102eb4d..ba2f788 100644 --- a/vcl/source/filter/jpeg/JpegWriter.cxx +++ b/vcl/source/filter/jpeg/JpegWriter.cxx @@ -86,7 +86,7 @@ extern "C" boolean empty_output_buffer (j_compress_ptr cinfo) destination->pub.next_output_byte = destination->buffer; destination->pub.free_in_buffer = BUFFER_SIZE; - return sal_True; + return TRUE; } extern "C" void term_destination (j_compress_ptr cinfo) -- 2.1.0