diff options
Diffstat (limited to 'vcl/source/filter/jpeg/jpegc.cxx')
-rw-r--r-- | vcl/source/filter/jpeg/jpegc.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/vcl/source/filter/jpeg/jpegc.cxx b/vcl/source/filter/jpeg/jpegc.cxx index cd87781ebd4f..ab56a35c0de7 100644 --- a/vcl/source/filter/jpeg/jpegc.cxx +++ b/vcl/source/filter/jpeg/jpegc.cxx @@ -55,7 +55,9 @@ struct ErrorManagerStruct #pragma warning(pop) #endif -extern "C" void errorExit (j_common_ptr cinfo) +extern "C" { + +static void errorExit (j_common_ptr cinfo) { char buffer[JMSG_LENGTH_MAX]; (*cinfo->err->format_message) (cinfo, buffer); @@ -64,19 +66,23 @@ extern "C" void errorExit (j_common_ptr cinfo) longjmp(error->setjmp_buffer, 1); } -extern "C" void outputMessage (j_common_ptr cinfo) +static void outputMessage (j_common_ptr cinfo) { char buffer[JMSG_LENGTH_MAX]; (*cinfo->err->format_message) (cinfo, buffer); SAL_WARN("vcl.filter", "failure reading JPEG: " << buffer); } +} + static int GetWarningLimit() { return utl::ConfigManager::IsFuzzing() ? 5 : 1000; } -extern "C" void emitMessage (j_common_ptr cinfo, int msg_level) +extern "C" { + +static void emitMessage (j_common_ptr cinfo, int msg_level) { if (msg_level < 0) { @@ -93,6 +99,8 @@ extern "C" void emitMessage (j_common_ptr cinfo, int msg_level) cinfo->err->output_message(cinfo); } +} + class JpegDecompressOwner { public: @@ -139,7 +147,7 @@ struct JpegStuff std::vector<sal_uInt8> pCYMKBuffer; }; -void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream, long* pLines, +static void ReadJPEG(JpegStuff& rContext, JPEGReader* pJPEGReader, void* pInputStream, long* pLines, Size const & previewSize, GraphicFilterImportFlags nImportFlags, BitmapScopedWriteAccess* ppAccess) { |