From 56bd4bab320b0c0a893751caee9a15a2241e3ef8 Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Wed, 24 Oct 2018 08:28:00 +0200 Subject: Fix build with poppler>=0.69 Remove no longer available Object::memCheck usage (which didn't do anything anyway since DEBUG_MEM was not set); add some const's Differential Revision: https://phabricator.kde.org/D16388 --- filters/karbon/pdf/PdfImport.cpp | 3 --- filters/karbon/pdf/SvgOutputDev.cpp | 8 ++++---- filters/karbon/pdf/SvgOutputDev.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp index c3e96b0..48b08df 100644 --- a/filters/karbon/pdf/PdfImport.cpp +++ b/filters/karbon/pdf/PdfImport.cpp @@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt delete globalParams; globalParams = 0; - // check for memory leaks - Object::memCheck(stderr); - return KoFilter::OK; } diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp index 931917a..7901317 100644 --- a/filters/karbon/pdf/SvgOutputDev.cpp +++ b/filters/karbon/pdf/SvgOutputDev.cpp @@ -212,7 +212,7 @@ QString SvgOutputDev::convertMatrix(const QMatrix &matrix) .arg(matrix.dx()) .arg(matrix.dy()); } -QString SvgOutputDev::convertMatrix(double * matrix) +QString SvgOutputDev::convertMatrix(const double * matrix) { return QString("matrix(%1 %2 %3 %4 %5 %6)") .arg(matrix[0]).arg(matrix[1]) @@ -402,7 +402,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) QString str; - char * p = s->getCString(); + const char * p = s->getCString(); int len = s->getLength(); CharCode code; Unicode *u = nullptr; @@ -429,7 +429,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) double x = state->getCurX(); double y = state->getCurY(); - double * ctm = state->getCTM(); + const double * ctm = state->getCTM(); QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); QMatrix mirror; @@ -522,7 +522,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, return; } - double * ctm = state->getCTM(); + const double * ctm = state->getCTM(); QMatrix m; m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h index 85fe55d..2a44908 100644 --- a/filters/karbon/pdf/SvgOutputDev.h +++ b/filters/karbon/pdf/SvgOutputDev.h @@ -84,7 +84,7 @@ public: private: QString convertPath(GfxPath *path); QString convertMatrix(const QMatrix &matrix); - QString convertMatrix(double * matrix); + QString convertMatrix(const double * matrix); QString printFill(); QString printStroke(); -- cgit v1.1