commit 8ec3c11697a4ed735b2a9d0ee1d759e42d7c6246
author Albert Astals Cid <aacid@kde.org> Fri Jun 21 18:57:00 2019 +0200
committer Albert Astals Cid <aacid@kde.org> Fri Jun 21 19:11:32 2019 +0200
tree 0bb0ce036f5ef0df4e6c0dd67c31d0197a22caf2
parent 7b088899d97981a9cd62f68fd632d7394f10c9d7

GfxFont: Rename local variable cmap to cnameCmap

Fixes shadow warning

poppler/GfxFont.cc

diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index c74b4b0..cdf8975 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -2188,7 +2188,6 @@
   unsigned long code;
   int wmode;
   const char **cmapName;
-  CMap *cMap;
   CMapListEntry *lp;
   int cmap;
   int cmapPlatform, cmapEncoding;
@@ -2261,14 +2260,15 @@
     for (cmapName = lp->CMaps;*cmapName != nullptr;cmapName++) {
       GooString cname(*cmapName);
 
-      if ((cMap = globalParams->getCMap(getCollection(),&cname))
+      CMap *cnameCMap;
+      if ((cnameCMap = globalParams->getCMap(getCollection(),&cname))
 	   != nullptr) {
-	    if (cMap->getWMode()) {
-		cMap->setReverseMap(vumap,n,1);
+	    if (cnameCMap->getWMode()) {
+		cnameCMap->setReverseMap(vumap,n,1);
 	    } else {
-		cMap->setReverseMap(humap,n,N_UCS_CANDIDATES);
+		cnameCMap->setReverseMap(humap,n,N_UCS_CANDIDATES);
 	    }
-	cMap->decRefCnt();
+	cnameCMap->decRefCnt();
       }
     }
     ff->setupGSUB(lp->scriptTag, lp->languageTag);