diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2015-01-14 02:34:45 +0200 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2015-01-14 02:34:45 +0200 |
| commit | f86d4e7da4d5a21761cc8764306908503d291ded (patch) | |
| tree | 833bc4e00ff876524dbdeb16f67ea6093816e337 /app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch | |
| parent | 40937953b3c8a564ba569bf767b08e0cb16a5170 (diff) | |
Added Libreoffice with our artwork theme
Diffstat (limited to 'app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch b/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch new file mode 100644 index 00000000..b72012b6 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-4.2.6.3-jpeg9.patch @@ -0,0 +1,52 @@ +From a96a0ae362070d8e99587c6d658c1e11895c717c Mon Sep 17 00:00:00 2001 +From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org> +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 + |