[Libreoffice-commits] core.git: vcl/source
Tor Lillqvist
tml at collabora.com
Fri Feb 28 01:43:50 PST 2014
vcl/source/filter/jpeg/JpegReader.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f3f9e2d4fe7fdff8dff6d4dab62f96b87f5141a4
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Feb 28 11:41:06 2014 +0200
WaE: implicit conversion from bool to 'boolean' (aka 'int')
'boolean' is from the JPEG library, typedeffed as int, yay.
Change-Id: I6d35c3616e50127f1e00b47c25cf962fdc92c3db
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx
index 1069773..2d31249 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -60,7 +60,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 = true;
+ source->start_of_file = 1;
}
long StreamRead( SvStream* pStream, void* pBuffer, long nBufferSize )
@@ -108,7 +108,7 @@ 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 = false;
+ source->start_of_file = 0;
return true;
}
More information about the Libreoffice-commits
mailing list