Attachment 134693 Details for Bug 103117 – The patch

[patch] The patch

0002-Clean-up-the-remaining-Splash-code-in-Arthur-backend.patch (text/plain), 6.00 KB, created by oliver.sander on 2017-10-05 21:44:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oliver.sander

Created: 2017-10-05 21:44:35 UTC

Size: 6.00 KB

patch

obsolete

>From de23439203ece3f9f7a19d52f6e92831efce2145 Mon Sep 17 00:00:00 2001
>From: Oliver Sander <oliver.sander@tu-dresden.de>
>Date: Fri, 15 Sep 2017 11:18:58 +0200
>Subject: [PATCH 2/3] Clean up the remaining Splash code in Arthur backend
>
>- remove some goto-style error handling
>- use nullptr
>- use std::unique_ptr (fixes a leak)
>- remove unused data member m_currentFont
>- remove some unused forward declarations
>---
> qt5/src/ArthurOutputDev.cc | 48 +++++++++++++++++-----------------------------
> qt5/src/ArthurOutputDev.h  |  4 ----
> 2 files changed, 18 insertions(+), 34 deletions(-)
>
>diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
>index 687e47c9..54e6e551 100644
>--- a/qt5/src/ArthurOutputDev.cc
>+++ b/qt5/src/ArthurOutputDev.cc
>@@ -352,14 +352,14 @@ void ArthurOutputDev::updateStrokeOpacity(GfxState *state)
> 
> void ArthurOutputDev::updateFont(GfxState *state)
> {
>-  GfxFont *font = state->getFont();
>-  if (!font)
>+  GfxFont *gfxFont = state->getFont();
>+  if (!gfxFont)
>   {
>     return;
>   }
> 
>   // is the font in the cache?
>-  ArthurFontID fontID = {*font->getID(), state->getFontSize()};
>+  ArthurFontID fontID = {*gfxFont->getID(), state->getFontSize()};
>   auto cacheEntry = m_rawFontCache.find(fontID);
> 
>   if (cacheEntry!=m_rawFontCache.end()) {
>@@ -372,14 +372,14 @@ void ArthurOutputDev::updateFont(GfxState *state)
>     // New font: load it into the cache
>     float fontSize = state->getFontSize();
> 
>-    GfxFontLoc* fontLoc = font->locateFont(xref, nullptr);
>+    std::unique_ptr<GfxFontLoc> fontLoc(gfxFont->locateFont(xref, nullptr));
> 
>     if (fontLoc) {
>       // load the font from respective location
>       switch (fontLoc->locType) {
>       case gfxFontLocEmbedded: {// if there is an embedded font, read it to memory
>         int fontDataLen;
>-        const char* fontData = font->readEmbFontFile(xref, &fontDataLen);
>+        const char* fontData = gfxFont->readEmbFontFile(xref, &fontDataLen);
> 
>         m_rawFont = new QRawFont(QByteArray(fontData, fontDataLen), fontSize);
>         m_rawFontCache.insert(std::make_pair(fontID,std::unique_ptr<QRawFont>(m_rawFont)));
>@@ -418,12 +418,9 @@ void ArthurOutputDev::updateFont(GfxState *state)
>   // *****************************************************************************
> 
> #ifdef HAVE_SPLASH
>-  GfxFont *gfxFont;
>-  GfxFontLoc *fontLoc;
>   GfxFontType fontType;
>-  SplashOutFontFileID *id;
>   SplashFontFile *fontFile;
>-  SplashFontSrc *fontsrc = NULL;
>+  SplashFontSrc *fontsrc = nullptr;
>   FoFiTrueType *ff;
>   Object refObj, strObj;
>   GooString *fileName;
>@@ -437,29 +434,26 @@ void ArthurOutputDev::updateFont(GfxState *state)
>   SplashFTFontFile* ftFontFile;
> 
>   m_needFontUpdate = false;
>-  fileName = NULL;
>-  tmpBuf = NULL;
>-  fontLoc = NULL;
>+  fileName = nullptr;
>+  tmpBuf = nullptr;
> 
>-  if (!(gfxFont = state->getFont())) {
>-    goto err1;
>-  }
>   fontType = gfxFont->getType();
>   if (fontType == fontType3) {
>-    goto err1;
>+    return;
>   }
> 
>   // Default: no codeToGID table
>   m_codeToGID = nullptr;
> 
>   // check the font file cache
>-  id = new SplashOutFontFileID(gfxFont->getID());
>+  SplashOutFontFileID *id = new SplashOutFontFileID(gfxFont->getID());
>   if ((fontFile = m_fontEngine->getFontFile(id))) {
>     delete id;
> 
>   } else {
> 
>-    if (!(fontLoc = gfxFont->locateFont(xref, NULL))) {
>+    std::unique_ptr<GfxFontLoc> fontLoc(gfxFont->locateFont(xref, nullptr));
>+    if (!fontLoc) {
>       error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
> 	    gfxFont->getName() ? gfxFont->getName()->getCString()
> 	                       : "(unnamed)");
>@@ -531,7 +525,7 @@ void ArthurOutputDev::updateFont(GfxState *state)
> 	n = 256;
> 	delete ff;
>       } else {
>-	codeToGID = NULL;
>+	codeToGID = nullptr;
> 	n = 0;
>       }
>       if (!(fontFile = m_fontEngine->loadTrueTypeFont(
>@@ -562,7 +556,7 @@ void ArthurOutputDev::updateFont(GfxState *state)
> 	memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
> 	       n * sizeof(int));
>       } else {
>-	codeToGID = NULL;
>+	codeToGID = nullptr;
> 	n = 0;
>       }      
>       if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
>@@ -577,7 +571,7 @@ void ArthurOutputDev::updateFont(GfxState *state)
>       break;
>     case fontCIDType2:
>     case fontCIDType2OT:
>-      codeToGID = NULL;
>+      codeToGID = nullptr;
>       n = 0;
>       if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
> 	n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
>@@ -622,18 +616,12 @@ void ArthurOutputDev::updateFont(GfxState *state)
>   // font in the Splash font cache.  Otherwise we'd load it again and again.
>   m_fontEngine->getFont(fontFile, mat, matrix);
> 
>-  delete fontLoc;
>   if (fontsrc && !fontsrc->isFile)
>       fontsrc->unref();
>   return;
> 
>  err2:
>   delete id;
>-  delete fontLoc;
>- err1:
>-  if (fontsrc && !fontsrc->isFile)
>-      fontsrc->unref();
>-  return;
> #endif
> }
> 
>@@ -809,7 +797,7 @@ void ArthurOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
> 
>   row_stride = (width + 3) & ~3;
>   buffer = (unsigned char *) malloc (height * row_stride);
>-  if (buffer == NULL) {
>+  if (buffer == nullptr) {
>     error(-1, "Unable to allocate memory for image.");
>     return;
>   }
>@@ -834,10 +822,10 @@ void ArthurOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
> 
>   image = cairo_image_surface_create_for_data (buffer, CAIRO_FORMAT_A8,
> 					  width, height, row_stride);
>-  if (image == NULL)
>+  if (image == nullptr)
>     return;
>   pattern = cairo_pattern_create_for_surface (image);
>-  if (pattern == NULL)
>+  if (pattern == nullptr)
>     return;
> 
>   ctm = state->getCTM();
>diff --git a/qt5/src/ArthurOutputDev.h b/qt5/src/ArthurOutputDev.h
>index a2ce20d0..3c93b4f8 100644
>--- a/qt5/src/ArthurOutputDev.h
>+++ b/qt5/src/ArthurOutputDev.h
>@@ -44,9 +44,6 @@
> #include <QtGui/QPainter>
> 
> class GfxState;
>-class GfxPath;
>-class Gfx8BitFont;
>-struct GfxRGB;
> 
> class SplashFontEngine;
> 
>@@ -176,7 +173,6 @@ public:
> private:
>   QPainter *m_painter;
>   FontHinting m_fontHinting;
>-  QFont m_currentFont;
>   QPen m_currentPen;
>   QBrush m_currentBrush;
>   GBool m_needFontUpdate;		// set when the font needs to be updated
>-- 
>2.14.1
>

Actions: View | Splinter Review

Attachments on bug 103117: 134693

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.