Attachment #778136 for bug #843605

Lines 1000-1005 calligra_drop_product_on_bad_condition( FILTER_WPG_TO_ODG Link Here

(-)a/CMakeLists.txt (+1 lines)
1000	calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG	1000	calligra_drop_product_on_bad_condition( FILTER_PDF_TO_SVG
1001	NOT_WIN "not supported on Windows"	1001	NOT_WIN "not supported on Windows"
1002	PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"	1002	PopplerXPDFHeaders_FOUND "poppler xpdf headers not found"
		1003	Poppler_FOUND "poppler qt5 headers not found"
1003	)	1004	)
1004		1005
1005	calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS	1006	calligra_drop_product_on_bad_condition( FILTER_HTML_TO_ODS

Lines 23-29 set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp ) Link Here

(-)a/filters/karbon/pdf/CMakeLists.txt (-1 / +1 lines)
23	add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})	23	add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
24	calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop)	24	calligra_filter_desktop_to_json(calligra_filter_pdf2svg calligra_filter_pdf2svg.desktop)
25		25
26	target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core)	26	target_link_libraries(calligra_filter_pdf2svg komain Poppler::Core Poppler::Qt5)
27		27
28	install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)	28	install(TARGETS calligra_filter_pdf2svg DESTINATION ${PLUGIN_INSTALL_DIR}/calligra/formatfilters)
29		29





#include <kpluginfactory.h>

#include <poppler-version.h>

#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) | (POPPLER_VERSION_MINOR << 8) | (POPPLER_VERSION_MICRO))

// Don't show this warning: it's an issue in poppler
#ifdef __GNUC__
#pragma GCC diagnostic ignored "-Wunused-parameter"

    if (! globalParams)
        return KoFilter::NotImplemented;

#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
    GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
    PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
#else
    std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
    PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
#endif
    if (! pdfDoc) {
#ifdef HAVE_POPPLER_PRE_0_83
- 

Return to bug 843605

Lines 30-35 Link Here

(-)a/filters/karbon/pdf/PdfImport.cpp (-3 / +7 lines)
30		30
31	#include <kpluginfactory.h>	31	#include <kpluginfactory.h>
32		32
		33	#include <poppler-version.h>
		34
		35	#define POPPLER_VERSION_MACRO ((POPPLER_VERSION_MAJOR << 16) \| (POPPLER_VERSION_MINOR << 8) \| (POPPLER_VERSION_MICRO))
		36
33	// Don't show this warning: it's an issue in poppler	37	// Don't show this warning: it's an issue in poppler
34	#ifdef __GNUC__	38	#ifdef __GNUC__
35	#pragma GCC diagnostic ignored "-Wunused-parameter"	39	#pragma GCC diagnostic ignored "-Wunused-parameter"
Lines 73-83 KoFilter::ConversionStatus PdfImport::co Link Here
73	if (! globalParams)	73	if (! globalParams)
74	return KoFilter::NotImplemented;	74	return KoFilter::NotImplemented;
75		75
76	#ifdef HAVE_POPPLER_PRE_22_3	76	#if POPPLER_VERSION_MACRO < QT_VERSION_CHECK(22, 03, 0)
77	GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());	77	GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
78	PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);	78	PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
79	#else	79	#else
80	PDFDoc * pdfDoc = new PDFDoc(std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data()));	80	std::unique_ptr<GooString> fname = std::make_unique<GooString>(QFile::encodeName(m_chain->inputFile()).data());
		81	PDFDoc * pdfDoc = new PDFDoc(std::move(fname));
81	#endif	82	#endif
82	if (! pdfDoc) {	83	if (! pdfDoc) {
83	#ifdef HAVE_POPPLER_PRE_0_83	84	#ifdef HAVE_POPPLER_PRE_0_83
84	-