diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-30 18:52:07 +0200 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2011-03-30 18:52:07 +0200 |
| commit | 1adba5eb789d93868f6bc5099c103d98376ee3cf (patch) | |
| tree | bc4ec013fd8defd7034069c37abc8cdf81a8c24a | |
| parent | 0ec3a97b80519a1046056aa607deeb0fd5668798 (diff) | |
masterfix DEV300: #i10000# build fixesooo/DEV300_m105
| -rw-r--r-- | binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx | 8 | ||||
| -rw-r--r-- | binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx index e02245ac1..6ac90e1f8 100644 --- a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx +++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpeg.cxx @@ -34,8 +34,8 @@ extern "C" #define INT32 JPEG_INT32 #include "stdio.h" #include "jpeg.h" - #include "jpeglib.h" - #include "jerror.h" + #include "jpeg/jpeglib.h" + #include "jpeg/jerror.h" #undef INT32 } @@ -116,7 +116,7 @@ extern "C" void init_destination (j_compress_ptr cinfo) dest->pub.free_in_buffer = BUF_SIZE; } -extern "C" int empty_output_buffer (j_compress_ptr cinfo) +extern "C" boolean empty_output_buffer (j_compress_ptr cinfo) { my_dest_ptr dest = (my_dest_ptr) cinfo->dest; @@ -221,7 +221,7 @@ long StreamRead( SvStream* pSvStm, void* pBuffer, long nBufferSize ) return nRead; } -extern "C" int fill_input_buffer (j_decompress_ptr cinfo) +extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo) { my_src_ptr src = (my_src_ptr) cinfo->src; size_t nbytes; diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c index 8658f6f31..08675d176 100644 --- a/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c +++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/svt_jpegc.c @@ -28,8 +28,8 @@ #include <stdio.h> #include <stdlib.h> #include "setjmp.h" -#include "jpeglib.h" -#include "jerror.h" +#include "jpeg/jpeglib.h" +#include "jpeg/jerror.h" #include "jpeg.h" #include "rtl/alloc.h" |