File 0003-Support-some-more-methods-returning-const.... of Package cups-filters

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Support-some-more-methods-returning-const.patch of Package cups-filters (Revision 68891116c77d2ab26a4cf1a46e8d2088)

Currently displaying revision 68891116c77d2ab26a4cf1a46e8d2088 , Show latest

From 8e96c4aa3b387d40b9fdfa1a535a6dece6937c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 28 Dec 2018 19:24:36 +0100
Subject: [PATCH 3/4] Support some more methods returning const

The return values of these methods should not be modified. Since poppler 0.70,
this is enforced for GfxFont::getCharName, and for State::getCTM since 0.72.
These methods now return const T*.
---
 filter/pdftoopvp/OPVPOutputDev.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/filter/pdftoopvp/OPVPOutputDev.cxx b/filter/pdftoopvp/OPVPOutputDev.cxx
index e9a4dde5..a85bfc31 100644
--- a/filter/pdftoopvp/OPVPOutputDev.cxx
+++ b/filter/pdftoopvp/OPVPOutputDev.cxx
@@ -294,7 +294,7 @@ void OPVPOutputDev::startPage(int pageNum, GfxState *state) {
 
   if (state) {
     if (scaleWidth > 0 && scaleHeight > 0) {
-      double *ctm = state->getCTM();
+      const double *ctm = state->getCTM();
 
       switch (rotate) {
       case 90:
@@ -709,7 +709,7 @@ void OPVPOutputDev::doUpdateFont(GfxState *state) {
   if (fontFile->doAdjustMatrix && !gfxFont->isCIDFont()) {
     double w1, w2;
     CharCode code;
-    char *name;
+    const char *name;
     for (code = 0; code < 256; ++code) {
       if ((name = ((Gfx8BitFont *)gfxFont)->getCharName(code)) &&
           name[0] == 'm' && name[1] == '\0') {
@@ -1060,7 +1060,7 @@ void OPVPOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
 				    int width, int height, bool invert,
 				    bool interpolate,
 				    bool inlineImg) {
-  double *ctm;
+  const double *ctm;
   SplashCoord mat[6];
   SplashOutImageMaskData imgMaskData;
 
@@ -1324,7 +1324,7 @@ void OPVPOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
 				GfxImageColorMap *colorMap,
 			        bool interpolate,
 				int *maskColors, bool inlineImg) {
-  double *ctm;
+  const double *ctm;
   SplashCoord mat[6];
   SplashOutImageData imgData;
   SplashColorMode srcMode;
@@ -1549,7 +1549,7 @@ void OPVPOutputDev::drawMaskedImage(GfxState *state, Object *ref,
 				      Stream *maskStr, int maskWidth,
 				      int maskHeight, bool maskInvert,
 				      bool maskInterpolate) {
-  double *ctm;
+  const double *ctm;
   SplashCoord mat[6];
   SplashOutMaskedImageData imgData;
   SplashOutImageMaskData imgMaskData;
@@ -1704,7 +1704,7 @@ void OPVPOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref,
 					  int maskWidth, int maskHeight,
 					  GfxImageColorMap *maskColorMap,
 					  bool maskInterpolate) {
-  double *ctm;
+  const double *ctm;
   SplashCoord mat[6];
   SplashOutImageData imgData;
   SplashOutImageData imgMaskData;
-- 
2.20.1

Places

File 0003-Support-some-more-methods-returning-const.patch of Package cups-filters (Revision 68891116c77d2ab26a4cf1a46e8d2088)

Places