GfxFontDict::hashFontObject1: Remove unnecessary copy calls
diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 014e5ca..172d837 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -2479,8 +2479,7 @@
return h.get31();
}
-void GfxFontDict::hashFontObject1(Object *obj, FNVHash *h) {
- Object obj2;
+void GfxFontDict::hashFontObject1(const Object *obj, FNVHash *h) {
const GooString *s;
const char *p;
double r;
@@ -2519,7 +2518,7 @@
n = obj->arrayGetLength();
h->hash((char *)&n, sizeof(int));
for (i = 0; i < n; ++i) {
- obj2 = obj->arrayGetNF(i).copy();
+ const Object &obj2 = obj->arrayGetNF(i);
hashFontObject1(&obj2, h);
}
break;
@@ -2530,7 +2529,7 @@
for (i = 0; i < n; ++i) {
p = obj->dictGetKey(i);
h->hash(p, (int)strlen(p));
- obj2 = obj->dictGetValNF(i).copy();
+ const Object &obj2 = obj->dictGetValNF(i);
hashFontObject1(&obj2, h);
}
break;
diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h
index de99e29..0b1b03e 100644
--- a/poppler/GfxFont.h
+++ b/poppler/GfxFont.h
@@ -13,7 +13,7 @@
// All changes made under the Poppler project to this file are licensed
// under GPL version 2 or later
//
-// Copyright (C) 2005, 2008, 2015, 2017, 2018 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2008, 2015, 2017-2019 Albert Astals Cid <aacid@kde.org>
// Copyright (C) 2006 Takashi Iwai <tiwai@suse.de>
// Copyright (C) 2006 Kristian Høgsberg <krh@redhat.com>
// Copyright (C) 2007 Julien Rebetez <julienr@svn.gnome.org>
@@ -456,7 +456,7 @@
private:
int hashFontObject(Object *obj);
- void hashFontObject1(Object *obj, FNVHash *h);
+ void hashFontObject1(const Object *obj, FNVHash *h);
GfxFont **fonts; // list of fonts
int numFonts; // number of fonts
