diff options
28 files changed, 95 insertions, 110 deletions
diff --git a/filter/CppunitTest_filter_ppm_test.mk b/filter/CppunitTest_filter_ppm_test.mk deleted file mode 100644 index 273db952300d..000000000000 --- a/filter/CppunitTest_filter_ppm_test.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,filter_ppm_test)) - -$(eval $(call gb_CppunitTest_use_external,filter_ppm_test,boost_headers)) - -$(eval $(call gb_CppunitTest_add_exception_objects,filter_ppm_test, \ - filter/qa/cppunit/filters-ppm-test \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,filter_ppm_test, \ - gie \ - sal \ - test \ - tl \ - unotest \ - vcl \ -)) - -$(eval $(call gb_CppunitTest_use_sdk_api,filter_ppm_test)) - -$(eval $(call gb_CppunitTest_use_ure,filter_ppm_test)) -$(eval $(call gb_CppunitTest_use_vcl,filter_ppm_test)) - -$(eval $(call gb_CppunitTest_use_components,filter_ppm_test,\ - configmgr/source/configmgr \ -)) - -$(eval $(call gb_CppunitTest_use_configuration,filter_ppm_test)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/Library_gie.mk b/filter/Library_gie.mk index d5ab8b8169a5..e04eb08fda7f 100644 --- a/filter/Library_gie.mk +++ b/filter/Library_gie.mk @@ -51,7 +51,6 @@ $(eval $(call gb_Library_use_libraries,gie,\ $(eval $(call gb_Library_add_exception_objects,gie,\ filter/source/graphicfilter/egif/egif \ filter/source/graphicfilter/egif/giflzwc \ - filter/source/graphicfilter/ipbm/ipbm \ filter/source/graphicfilter/idxf/dxf2mtf \ filter/source/graphicfilter/idxf/dxfblkrd \ filter/source/graphicfilter/idxf/dxfentrd \ diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 678c882dce88..607a5fc46d0c 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Module_add_check_targets,filter,\ ifneq ($(DISABLE_CVE_TESTS),TRUE) $(eval $(call gb_Module_add_check_targets,filter,\ CppunitTest_filter_dxf_test \ - CppunitTest_filter_ppm_test \ CppunitTest_filter_svg \ )) endif diff --git a/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu index 49db4b3c7eb4..0e7f0b9402b5 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pbm_Import.xcu @@ -15,13 +15,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <node oor:name="pbm_Import" oor:op="replace" > - <prop oor:name="Type"><value>pbm_Portable_Bitmap</value></prop> - <prop oor:name="FormatName"><value>ipb</value></prop> - <prop oor:name="RealFilterName"><value>PBM - Portable Bitmap</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="UIName"> - <value xml:lang="en-US">PBM - Portable Bitmap</value> - </prop> - <prop oor:name="Flags"><value>IMPORT</value></prop> - </node> + +<node oor:name="pbm_Import" oor:op="replace" > + <prop oor:name="Type"><value>pbm_Portable_Bitmap</value></prop> + <prop oor:name="FormatName"><value>SVPBM</value></prop> + <prop oor:name="RealFilterName"><value>PBM - Portable Bitmap</value></prop> + <prop oor:name="UIComponent"/> + <prop oor:name="UIName"> + <value xml:lang="en-US">PBM - Portable Bitmap</value> + </prop> + <prop oor:name="Flags"><value>IMPORT</value></prop> +</node> diff --git a/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu index 2e1d4bb27f68..0356e69543f5 100644 --- a/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/pgm_Import.xcu @@ -15,13 +15,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <node oor:name="pgm_Import" oor:op="replace" > - <prop oor:name="Type"><value>pgm_Portable_Graymap</value></prop> - <prop oor:name="FormatName"><value>ipb</value></prop> - <prop oor:name="RealFilterName"><value>PGM - Portable Graymap</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="UIName"> - <value xml:lang="en-US">PGM - Portable Graymap</value> - </prop> - <prop oor:name="Flags"><value>IMPORT</value></prop> - </node> + +<node oor:name="pgm_Import" oor:op="replace" > + <prop oor:name="Type"><value>pgm_Portable_Graymap</value></prop> + <prop oor:name="FormatName"><value>SVPBM</value></prop> + <prop oor:name="RealFilterName"><value>PGM - Portable Graymap</value></prop> + <prop oor:name="UIComponent"/> + <prop oor:name="UIName"> + <value xml:lang="en-US">PGM - Portable Graymap</value> + </prop> + <prop oor:name="Flags"><value>IMPORT</value></prop> +</node> diff --git a/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu b/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu index c2213e24f8bc..03134558c806 100644 --- a/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu +++ b/filter/source/config/fragments/internalgraphicfilters/ppm_Import.xcu @@ -15,13 +15,14 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - <node oor:name="ppm_Import" oor:op="replace" > - <prop oor:name="Type"><value>ppm_Portable_Pixelmap</value></prop> - <prop oor:name="FormatName"><value>ipb</value></prop> - <prop oor:name="RealFilterName"><value>PPM - Portable Pixelmap</value></prop> - <prop oor:name="UIComponent"/> - <prop oor:name="UIName"> - <value xml:lang="en-US">PPM - Portable Pixelmap</value> - </prop> - <prop oor:name="Flags"><value>IMPORT</value></prop> - </node> + +<node oor:name="ppm_Import" oor:op="replace" > + <prop oor:name="Type"><value>ppm_Portable_Pixelmap</value></prop> + <prop oor:name="FormatName"><value>SVPBM</value></prop> + <prop oor:name="RealFilterName"><value>PPM - Portable Pixelmap</value></prop> + <prop oor:name="UIComponent"/> + <prop oor:name="UIName"> + <value xml:lang="en-US">PPM - Portable Pixelmap</value> + </prop> + <prop oor:name="Flags"><value>IMPORT</value></prop> +</node> diff --git a/include/vcl/graphicfilter.hxx b/include/vcl/graphicfilter.hxx index 992aac639729..f0d0511aac97 100644 --- a/include/vcl/graphicfilter.hxx +++ b/include/vcl/graphicfilter.hxx @@ -87,6 +87,7 @@ namespace o3tl #define IMP_EPS "SVIEPS" #define IMP_PSD "SVPSD" #define IMP_PCD "SVPCD" +#define IMP_PBM "SVPBM" #define EXP_BMP "SVBMP" #define EXP_SVMETAFILE "SVMETAFILE" #define EXP_WMF "SVWMF" @@ -377,6 +378,7 @@ public: static ErrCode readEPS(SvStream & rStream, Graphic & rGraphic); static ErrCode readPSD(SvStream & rStream, Graphic & rGraphic); static ErrCode readPCD(SvStream & rStream, Graphic & rGraphic); + static ErrCode readPBM(SvStream & rStream, Graphic & rGraphic); private: OUString aFilterPath; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index da73d5a5147d..03fe8e0d3c52 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -3898,7 +3898,6 @@ external/unixODBC/inc/odbc/sqltypes.h external/unixODBC/inc/odbc/sqlucode.h filter/inc/strings.hxx filter/qa/cppunit/filters-dxf-test.cxx -filter/qa/cppunit/filters-ppm-test.cxx filter/qa/cppunit/msfilter-test.cxx filter/qa/cppunit/priority-test.cxx filter/qa/cppunit/xslt-test.cxx @@ -3964,7 +3963,6 @@ filter/source/graphicfilter/idxf/dxftblrd.hxx filter/source/graphicfilter/idxf/dxfvec.cxx filter/source/graphicfilter/idxf/dxfvec.hxx filter/source/graphicfilter/idxf/idxf.cxx -filter/source/graphicfilter/ipbm/ipbm.cxx filter/source/msfilter/countryid.cxx filter/source/msfilter/dffpropset.cxx filter/source/msfilter/escherex.cxx @@ -14813,6 +14811,7 @@ vcl/qa/cppunit/graphicfilter/filters-met-test.cxx vcl/qa/cppunit/graphicfilter/filters-pcd-test.cxx vcl/qa/cppunit/graphicfilter/filters-pcx-test.cxx vcl/qa/cppunit/graphicfilter/filters-pict-test.cxx +vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx vcl/qa/cppunit/graphicfilter/filters-psd-test.cxx vcl/qa/cppunit/graphicfilter/filters-ras-test.cxx vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -14928,6 +14927,7 @@ vcl/source/filter/igif/decode.cxx vcl/source/filter/igif/decode.hxx vcl/source/filter/igif/gifread.cxx vcl/source/filter/imet/ios2met.cxx +vcl/source/filter/ipbm/ipbm.cxx vcl/source/filter/ipcd/ipcd.cxx vcl/source/filter/ipcx/ipcx.cxx vcl/source/filter/ipict/ipict.cxx diff --git a/vcl/CppunitTest_vcl_filters_test.mk b/vcl/CppunitTest_vcl_filters_test.mk index 8ebc4c7c1ae0..ccb427dddd6c 100644 --- a/vcl/CppunitTest_vcl_filters_test.mk +++ b/vcl/CppunitTest_vcl_filters_test.mk @@ -15,6 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,vcl_filters_test, \ vcl/qa/cppunit/graphicfilter/filters-pcd-test \ vcl/qa/cppunit/graphicfilter/filters-pcx-test \ vcl/qa/cppunit/graphicfilter/filters-pict-test \ + vcl/qa/cppunit/graphicfilter/filters-ppm-test \ vcl/qa/cppunit/graphicfilter/filters-psd-test \ vcl/qa/cppunit/graphicfilter/filters-ras-test \ vcl/qa/cppunit/graphicfilter/filters-test \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 42b3b86f3ef1..89d453cd7add 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -440,6 +440,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/filter/igif/decode \ vcl/source/filter/igif/gifread \ vcl/source/filter/imet/ios2met \ + vcl/source/filter/ipbm/ipbm \ vcl/source/filter/ipcd/ipcd \ vcl/source/filter/ipcx/ipcx \ vcl/source/filter/ipict/ipict \ diff --git a/vcl/inc/filter/PbmReader.hxx b/vcl/inc/filter/PbmReader.hxx new file mode 100644 index 000000000000..5fe4d8a295ef --- /dev/null +++ b/vcl/inc/filter/PbmReader.hxx @@ -0,0 +1,26 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#pragma once + +#include <vcl/graph.hxx> + +VCL_DLLPUBLIC bool ImportPbmGraphic(SvStream& rStream, Graphic& rGraphic); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/filter/qa/cppunit/data/pbm/fail/.gitignore b/vcl/qa/cppunit/graphicfilter/data/pbm/fail/.gitignore index e69de29bb2d1..e69de29bb2d1 100644 --- a/filter/qa/cppunit/data/pbm/fail/.gitignore +++ b/vcl/qa/cppunit/graphicfilter/data/pbm/fail/.gitignore diff --git a/filter/qa/cppunit/data/pbm/fail/crash-1.pbm b/vcl/qa/cppunit/graphicfilter/data/pbm/fail/crash-1.pbm index 9ddcddfe669c..9ddcddfe669c 100644 --- a/filter/qa/cppunit/data/pbm/fail/crash-1.pbm +++ b/vcl/qa/cppunit/graphicfilter/data/pbm/fail/crash-1.pbm diff --git a/filter/qa/cppunit/data/pbm/fail/hang-1.pbm b/vcl/qa/cppunit/graphicfilter/data/pbm/fail/hang-1.pbm Binary files differindex 21742d204c79..21742d204c79 100644 --- a/filter/qa/cppunit/data/pbm/fail/hang-1.pbm +++ b/vcl/qa/cppunit/graphicfilter/data/pbm/fail/hang-1.pbm diff --git a/filter/qa/cppunit/data/pbm/indeterminate/.gitignore b/vcl/qa/cppunit/graphicfilter/data/pbm/indeterminate/.gitignore index e9c5b1765b8f..e9c5b1765b8f 100644 --- a/filter/qa/cppunit/data/pbm/indeterminate/.gitignore +++ b/vcl/qa/cppunit/graphicfilter/data/pbm/indeterminate/.gitignore diff --git a/filter/qa/cppunit/data/pbm/pass/.gitignore b/vcl/qa/cppunit/graphicfilter/data/pbm/pass/.gitignore index e69de29bb2d1..e69de29bb2d1 100644 --- a/filter/qa/cppunit/data/pbm/pass/.gitignore +++ b/vcl/qa/cppunit/graphicfilter/data/pbm/pass/.gitignore diff --git a/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm b/vcl/qa/cppunit/graphicfilter/data/pbm/pass/rhbz160429-1.pbm Binary files differindex d6e3fc6349b8..d6e3fc6349b8 100644 --- a/filter/qa/cppunit/data/pbm/pass/rhbz160429-1.pbm +++ b/vcl/qa/cppunit/graphicfilter/data/pbm/pass/rhbz160429-1.pbm diff --git a/filter/qa/cppunit/data/ppm/fail/.gitignore b/vcl/qa/cppunit/graphicfilter/data/ppm/fail/.gitignore index e69de29bb2d1..e69de29bb2d1 100644 --- a/filter/qa/cppunit/data/ppm/fail/.gitignore +++ b/vcl/qa/cppunit/graphicfilter/data/ppm/fail/.gitignore diff --git a/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm b/vcl/qa/cppunit/graphicfilter/data/ppm/fail/CVE-2008-1097-1.ppm Binary files differindex 457289577df7..457289577df7 100644 --- a/filter/qa/cppunit/data/ppm/fail/CVE-2008-1097-1.ppm +++ b/vcl/qa/cppunit/graphicfilter/data/ppm/fail/CVE-2008-1097-1.ppm diff --git a/filter/qa/cppunit/data/ppm/indeterminate/.gitignore b/vcl/qa/cppunit/graphicfilter/data/ppm/indeterminate/.gitignore index e9c5b1765b8f..e9c5b1765b8f 100644 --- a/filter/qa/cppunit/data/ppm/indeterminate/.gitignore +++ b/vcl/qa/cppunit/graphicfilter/data/ppm/indeterminate/.gitignore diff --git a/filter/qa/cppunit/data/ppm/pass/.gitignore b/vcl/qa/cppunit/graphicfilter/data/ppm/pass/.gitignore index e69de29bb2d1..e69de29bb2d1 100644 --- a/filter/qa/cppunit/data/ppm/pass/.gitignore +++ b/vcl/qa/cppunit/graphicfilter/data/ppm/pass/.gitignore diff --git a/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm b/vcl/qa/cppunit/graphicfilter/data/ppm/pass/fdo19811-2.ppm Binary files differindex 828b9725693e..828b9725693e 100644 --- a/filter/qa/cppunit/data/ppm/pass/fdo19811-2.ppm +++ b/vcl/qa/cppunit/graphicfilter/data/ppm/pass/fdo19811-2.ppm diff --git a/filter/qa/cppunit/filters-ppm-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx index 43ae966a0c57..c9c93a687d93 100644 --- a/filter/qa/cppunit/filters-ppm-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-ppm-test.cxx @@ -12,13 +12,7 @@ #include <vcl/FilterConfigItem.hxx> #include <tools/stream.hxx> #include <vcl/graph.hxx> - -extern "C" -{ - SAL_DLLPUBLIC_EXPORT bool SAL_CALL - ipbGraphicImport(SvStream & rStream, Graphic & rGraphic, - FilterConfigItem*); -} +#include <filter/PbmReader.hxx> using namespace ::com::sun::star; @@ -51,20 +45,20 @@ bool PpmFilterTest::load(const OUString &, { SvFileStream aFileStream(rURL, StreamMode::READ); Graphic aGraphic; - return ipbGraphicImport(aFileStream, aGraphic, nullptr); + return ImportPbmGraphic(aFileStream, aGraphic); } void PpmFilterTest::testCVEs() { +#ifndef DISABLE_CVE_TESTS testDir(OUString(), - m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/ppm/")); + m_directories.getURLFromSrc(u"/vcl/qa/cppunit/graphicfilter/data/ppm/")); testDir(OUString(), - m_directories.getURLFromSrc(u"/filter/qa/cppunit/data/pbm/")); + m_directories.getURLFromSrc(u"/vcl/qa/cppunit/graphicfilter/data/pbm/")); +#endif } CPPUNIT_TEST_SUITE_REGISTRATION(PpmFilterTest); -CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 9e5a1a236955..0f19f717f2c8 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -44,7 +44,7 @@ const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameLi IMP_BMP, IMP_GIF, IMP_PNG, IMP_JPEG, IMP_XBM, IMP_XPM, EXP_BMP, EXP_JPEG, EXP_PNG, IMP_MOV, IMP_TIFF, EXP_TIFF, IMP_TGA, IMP_PICT, IMP_MET, IMP_RAS, IMP_PCX, IMP_PSD, - IMP_PCD, nullptr + IMP_PCD, IMP_PBM, nullptr }; const char* FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameList[] = @@ -56,8 +56,7 @@ const char* FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameL const char* FilterConfigCache::FilterConfigCacheEntry::ExternalPixelFilterNameList[] = { - "egi", "ipb", "epb", "epg", - "epp", nullptr + "egi", "epb", "epg", "epp", nullptr }; void FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUString& rUserDataEntry ) @@ -238,9 +237,9 @@ const char* FilterConfigCache::InternalFilterListForSvxLight[] = "pcd","1","SVPCD", "psd","1","SVPSD", "pcx","1","SVPCX", - "pbm","1","ipb", - "pgm","1","ipb", - "ppm","1","ipb", + "pbm","1","SVPBM", + "pgm","1","SVPBM", + "ppm","1","SVPBM", "ras","1","SVRAS", "svm","1","SVMETAFILE", "svm","2","SVMETAFILE", diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 3e10e33debbf..1257827f5333 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -58,6 +58,7 @@ #include <filter/EpsWriter.hxx> #include <filter/PsdReader.hxx> #include <filter/PcdReader.hxx> +#include <filter/PbmReader.hxx> #include <osl/module.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/awt/Size.hpp> @@ -649,7 +650,6 @@ ImpFilterLibCacheEntry::ImpFilterLibCacheEntry( const OUString& rPathname, const #ifdef DISABLE_DYNLOADING extern "C" bool idxGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem ); -extern "C" bool ipbGraphicImport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem ); #endif @@ -660,13 +660,9 @@ PFilterCall ImpFilterLibCacheEntry::GetImportFunction() #ifndef DISABLE_DYNLOADING if (maFormatName == "idx") mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("idxGraphicImport")); - else if (maFormatName == "ipb") - mpfnImport = reinterpret_cast<PFilterCall>(maLibrary.getFunctionSymbol("ipbGraphicImport")); #else if (maFormatName == "idx") mpfnImport = idxGraphicImport; - else if (maFormatName == "ipb") - mpfnImport = ipbGraphicImport; #endif } @@ -1756,6 +1752,14 @@ ErrCode GraphicFilter::readPCD(SvStream & rStream, Graphic & rGraphic) return ERRCODE_GRFILTER_FILTERERROR; } +ErrCode GraphicFilter::readPBM(SvStream & rStream, Graphic & rGraphic) +{ + if (ImportPbmGraphic(rStream, rGraphic)) + return ERRCODE_NONE; + else + return ERRCODE_GRFILTER_FILTERERROR; +} + ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, GraphicFilterImportFlags nImportFlags, const css::uno::Sequence< css::beans::PropertyValue >* /*pFilterData*/, @@ -1901,6 +1905,10 @@ ErrCode GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, { nStatus = readPCD(rIStream, rGraphic); } + else if (aFilterName.equalsIgnoreAsciiCase(IMP_PBM)) + { + nStatus = readPBM(rIStream, rGraphic); + } else nStatus = ERRCODE_GRFILTER_FILTERERROR; } diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/vcl/source/filter/ipbm/ipbm.cxx index 4c12c18523fd..7794e611ef4c 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/vcl/source/filter/ipbm/ipbm.cxx @@ -23,6 +23,7 @@ #include <vcl/graph.hxx> #include <vcl/BitmapTools.hxx> #include <tools/stream.hxx> +#include <filter/PbmReader.hxx> //============================ PBMReader ================================== @@ -530,8 +531,7 @@ bool PBMReader::ImplReadBody() //================== GraphicImport - the exported function ================ -extern "C" SAL_DLLPUBLIC_EXPORT bool -ipbGraphicImport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* ) +bool ImportPbmGraphic( SvStream & rStream, Graphic & rGraphic) { PBMReader aPBMReader(rStream); diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index 02dc6d90eb21..45deeee37169 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -51,6 +51,7 @@ #include <filter/EpsReader.hxx> #include <filter/PsdReader.hxx> #include <filter/PcdReader.hxx> +#include <filter/PbmReader.hxx> #include <osl/file.hxx> #include <osl/module.hxx> #include <tools/stream.hxx> @@ -194,18 +195,9 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } else if ((strcmp(argv[2], "pbm") == 0) || strcmp(argv[2], "ppm") == 0) { - static PFilterCall pfnImport(nullptr); - if (!pfnImport) - { - osl::Module aLibrary; - aLibrary.loadRelative(&thisModule, "libgielo.so"); - pfnImport = reinterpret_cast<PFilterCall>( - aLibrary.getFunctionSymbol("ipbGraphicImport")); - aLibrary.release(); - } Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = static_cast<int>((*pfnImport)(aFileStream, aGraphic, nullptr)); + ret = static_cast<int>(ImportPbmGraphic(aFileStream, aGraphic)); } else if (strcmp(argv[2], "psd") == 0) { diff --git a/vcl/workben/ppmfuzzer.cxx b/vcl/workben/ppmfuzzer.cxx index 854d457c5503..9595fa3aa747 100644 --- a/vcl/workben/ppmfuzzer.cxx +++ b/vcl/workben/ppmfuzzer.cxx @@ -10,6 +10,7 @@ #include <tools/stream.hxx> #include <vcl/FilterConfigItem.hxx> #include "commonfuzzer.hxx" +#include <filter/PbmReader.hxx> #include <config_features.h> #include <osl/detail/component-mapping.h> @@ -39,8 +40,6 @@ extern "C" void* lo_get_custom_widget_func(const char*) return nullptr; } -extern "C" bool ipbGraphicImport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pConfigItem); - extern "C" int LLVMFuzzerInitialize(int *argc, char ***argv) { TypicalFuzzerInitialize(argc, argv); @@ -51,7 +50,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { SvMemoryStream aStream(const_cast<uint8_t*>(data), size, StreamMode::READ); Graphic aGraphic; - (void)ipbGraphicImport(aStream, aGraphic, nullptr); + (void)ImportPbmGraphic(aStream, aGraphic); return 0; } |