diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-04-19 09:59:09 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2018-05-22 12:17:01 +0200 |
commit | 6a0afcffec86329d65ddb7aad057ecb7ed620f35 (patch) | |
tree | e10c7a146b0446513416fdf1395413db7e01861b /vcl | |
parent | 11b7f60fa063a51cdb9f021acafafdcae1e3016d (diff) |
vcl JPEG import: remove unused pCallerData
Which is always set to nullptr, is passed around, finally just ignored.
Reviewed-on: https://gerrit.libreoffice.org/36662
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 13414a637f30375a62c02f54c054e358f7565d05)
Change-Id: I81aecbed33ea249e63fbb412a54345fbb8335e47
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/JpegReader.cxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/JpegReader.hxx | 2 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/jpeg.cxx | 4 | ||||
-rw-r--r-- | vcl/source/filter/jpeg/jpeg.hxx | 2 | ||||
-rw-r--r-- | vcl/workben/fftester.cxx | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 4d254a549ca3..8fb5ced336f4 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1501,7 +1501,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat if( !( nImportFlags & GraphicFilterImportFlags::DontSetLogsizeForJpeg ) ) nImportFlags |= GraphicFilterImportFlags::SetLogsizeForJpeg; - if( !ImportJPEG( rIStream, rGraphic, nullptr, nImportFlags ) ) + if( !ImportJPEG( rIStream, rGraphic, nImportFlags ) ) nStatus = GRFILTER_FILTERERROR; else eLinkType = GfxLinkType::NativeJpg; diff --git a/vcl/source/filter/jpeg/JpegReader.cxx b/vcl/source/filter/jpeg/JpegReader.cxx index cde54c49dbde..9f8510a4f4b1 100644 --- a/vcl/source/filter/jpeg/JpegReader.cxx +++ b/vcl/source/filter/jpeg/JpegReader.cxx @@ -169,7 +169,7 @@ void jpeg_svstream_src (j_decompress_ptr cinfo, void* input) source->pub.next_input_byte = nullptr; /* until buffer loaded */ } -JPEGReader::JPEGReader( SvStream& rStream, void* /*pCallData*/, bool bSetLogSize ) : +JPEGReader::JPEGReader( SvStream& rStream, bool bSetLogSize ) : mrStream ( rStream ), mnLastPos ( rStream.Tell() ), mnLastLines ( 0 ), diff --git a/vcl/source/filter/jpeg/JpegReader.hxx b/vcl/source/filter/jpeg/JpegReader.hxx index 33625198e067..bb020f449f19 100644 --- a/vcl/source/filter/jpeg/JpegReader.hxx +++ b/vcl/source/filter/jpeg/JpegReader.hxx @@ -57,7 +57,7 @@ class JPEGReader : public GraphicReader Graphic CreateIntermediateGraphic(long nLines); public: - JPEGReader( SvStream& rStream, void* pCallData, bool bSetLogSize ); + JPEGReader( SvStream& rStream, bool bSetLogSize ); virtual ~JPEGReader() override; ReadState Read(Graphic& rGraphic); diff --git a/vcl/source/filter/jpeg/jpeg.cxx b/vcl/source/filter/jpeg/jpeg.cxx index ca780f1c6bcc..f1cb2eb2ed65 100644 --- a/vcl/source/filter/jpeg/jpeg.cxx +++ b/vcl/source/filter/jpeg/jpeg.cxx @@ -25,7 +25,7 @@ #include <vcl/FilterConfigItem.hxx> #include <vcl/graphicfilter.hxx> -VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerData, GraphicFilterImportFlags nImportFlags ) +VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, GraphicFilterImportFlags nImportFlags ) { bool bReturn = true; @@ -34,7 +34,7 @@ VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* JPEGReader* pJPEGReader = dynamic_cast<JPEGReader*>( pContext.get() ); if (!pJPEGReader) { - pContext = std::make_shared<JPEGReader>( rInputStream, pCallerData, bool( nImportFlags & GraphicFilterImportFlags::SetLogsizeForJpeg ) ); + pContext = std::make_shared<JPEGReader>( rInputStream, bool( nImportFlags & GraphicFilterImportFlags::SetLogsizeForJpeg ) ); pJPEGReader = static_cast<JPEGReader*>( pContext.get() ); } diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx index 118ff09fc125..f8f900ace03d 100644 --- a/vcl/source/filter/jpeg/jpeg.hxx +++ b/vcl/source/filter/jpeg/jpeg.hxx @@ -27,7 +27,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, void* pCallerData, GraphicFilterImportFlags nImportFlags ); +VCL_DLLPUBLIC bool ImportJPEG( SvStream& rInputStream, Graphic& rGraphic, GraphicFilterImportFlags nImportFlags ); bool ExportJPEG(SvStream& rOutputStream, const Graphic& rGraphic, diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 8c2c86df70e1..45d10f928e86 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -114,7 +114,7 @@ try_again: { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ImportJPEG(aFileStream, aGraphic, nullptr, GraphicFilterImportFlags::NONE); + ret = (int) ImportJPEG(aFileStream, aGraphic, GraphicFilterImportFlags::NONE); BitmapEx aTarget = aGraphic.GetBitmapEx(); aTarget.Convert(BmpConversion::N24Bit); } |