poppler/Annot.cc           |   36 ------------------------------------
 poppler/CairoFontEngine.cc |    2 --
 poppler/Catalog.cc         |    1 -
 poppler/Form.cc            |    2 +-
 poppler/Lexer.cc           |    1 -
 poppler/Link.cc            |    2 --
 poppler/PDFDoc.cc          |    1 -
 poppler/SplashOutputDev.cc |    2 --
 poppler/XRef.cc            |    1 -
 qt5/src/ArthurOutputDev.cc |    1 -
 utils/JSInfo.cc            |    1 -
 utils/pdfinfo.cc           |    1 -
 utils/pdfseparate.cc       |    1 -
 13 files changed, 1 insertion(+), 51 deletions(-)

New commits:
commit 7f550e88d86482adcfab6e054ff14588b32b692a
Author: Albert Astals Cid <aa...@kde.org>
Date:   Sun Jan 14 20:51:19 2018 +0100

    Remove declare but unused Object instances

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index 373cddb2..15c86a05 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -1837,8 +1837,6 @@ void Annot::draw(Gfx *gfx, GBool printing) {
 
 AnnotPopup::AnnotPopup(PDFDoc *docA, PDFRectangle *rect) :
     Annot(docA, rect) {
-  Object obj1;
-
   type = typePopup;
 
   annotObj.dictSet ("Subtype", Object(objName, "Popup"));
@@ -2163,8 +2161,6 @@ void AnnotText::initialize(PDFDoc *docA, Dict *dict) {
 }
 
 void AnnotText::setOpen(GBool openA) {
-  Object obj1;
-
   open = openA;
   update ("Open", Object(open));
 }
@@ -2502,8 +2498,6 @@ void AnnotText::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotLink::AnnotLink(PDFDoc *docA, PDFRectangle *rect) :
     Annot(docA, rect) {
-  Object obj1;
-
   type = typeLink;
   annotObj.dictSet ("Subtype", Object(objName, "Link"));
   initialize (docA, annotObj.getDict());
@@ -2602,8 +2596,6 @@ void AnnotLink::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotFreeText::AnnotFreeText(PDFDoc *docA, PDFRectangle *rect, GooString *da) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeFreeText;
 
   annotObj.dictSet ("Subtype", Object(objName, "FreeText"));
@@ -2749,7 +2741,6 @@ void AnnotFreeText::setAppearanceString(GooString 
*new_string) {
 }
 
 void AnnotFreeText::setQuadding(AnnotFreeTextQuadding new_quadding) {
-  Object obj1;
   quadding = new_quadding;
   update ("Q", Object((int)quadding));
   invalidateAppearance();
@@ -2996,8 +2987,6 @@ Object AnnotFreeText::getAppearanceResDict() {
 
 AnnotLine::AnnotLine(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeLine;
   annotObj.dictSet ("Subtype", Object(objName, "Line"));
 
@@ -3442,8 +3431,6 @@ Object AnnotLine::getAppearanceResDict() {
 //------------------------------------------------------------------------
 AnnotTextMarkup::AnnotTextMarkup(PDFDoc *docA, PDFRectangle *rect, 
AnnotSubtype subType) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   switch (subType) {
     case typeHighlight:
       annotObj.dictSet ("Subtype", Object(objName, "Highlight"));
@@ -4991,8 +4978,6 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotMovie::AnnotMovie(PDFDoc *docA, PDFRectangle *rect, Movie *movieA) :
     Annot(docA, rect) {
-  Object obj1;
-
   type = typeMovie;
   annotObj.dictSet ("Subtype", Object(objName, "Movie"));
 
@@ -5127,8 +5112,6 @@ void AnnotMovie::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotScreen::AnnotScreen(PDFDoc *docA, PDFRectangle *rect) :
     Annot(docA, rect) {
-  Object obj1;
-
   type = typeScreen;
 
   annotObj.dictSet ("Subtype", Object(objName, "Screen"));
@@ -5190,8 +5173,6 @@ LinkAction* 
AnnotScreen::getAdditionalAction(AdditionalActionsType type)
 //------------------------------------------------------------------------
 AnnotStamp::AnnotStamp(PDFDoc *docA, PDFRectangle *rect) :
   AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeStamp;
   annotObj.dictSet ("Subtype", Object(objName, "Stamp"));
   initialize(docA, annotObj.getDict());
@@ -5235,8 +5216,6 @@ void AnnotStamp::setIcon(GooString *new_icon) {
 //------------------------------------------------------------------------
 AnnotGeometry::AnnotGeometry(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype 
subType) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   switch (subType) {
     case typeSquare:
       annotObj.dictSet ("Subtype", Object(objName, "Square"));
@@ -5447,8 +5426,6 @@ void AnnotGeometry::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotPolygon::AnnotPolygon(PDFDoc *docA, PDFRectangle *rect, AnnotSubtype 
subType) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   switch (subType) {
     case typePolygon:
       annotObj.dictSet ("Subtype", Object(objName, "Polygon"));
@@ -5716,8 +5693,6 @@ void AnnotPolygon::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotCaret::AnnotCaret(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeCaret;
 
   annotObj.dictSet ("Subtype", Object(objName, "Caret"));
@@ -5767,14 +5742,11 @@ void AnnotCaret::setSymbol(AnnotCaretSymbol new_symbol) 
{
 //------------------------------------------------------------------------
 AnnotInk::AnnotInk(PDFDoc *docA, PDFRectangle *rect) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeInk;
 
   annotObj.dictSet ("Subtype", Object(objName, "Ink"));
 
   // Store dummy path with one null vertex only
-  Object obj3, obj4;
   Array *inkList = new Array(doc->getXRef());
   Array *vList = new Array(doc->getXRef());
   vList->add(Object(0.));
@@ -5930,8 +5902,6 @@ void AnnotInk::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotFileAttachment::AnnotFileAttachment(PDFDoc *docA, PDFRectangle *rect, 
GooString *filename) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeFileAttachment;
 
   annotObj.dictSet("Subtype", Object(objName, "FileAttachment"));
@@ -6135,8 +6105,6 @@ void AnnotFileAttachment::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 AnnotSound::AnnotSound(PDFDoc *docA, PDFRectangle *rect, Sound *soundA) :
     AnnotMarkup(docA, rect) {
-  Object obj1;
-
   type = typeSound;
 
   annotObj.dictSet ("Subtype", Object(objName, "Sound"));
@@ -6288,8 +6256,6 @@ void AnnotSound::draw(Gfx *gfx, GBool printing) {
 //------------------------------------------------------------------------
 Annot3D::Annot3D(PDFDoc *docA, PDFRectangle *rect) :
     Annot(docA, rect) {
-  Object obj1;
-
   type = type3D;
 
   annotObj.dictSet ("Subtype", Object(objName, "3D"));
@@ -6406,8 +6372,6 @@ Annot3D::Activation::Activation(Dict *dict) {
 //------------------------------------------------------------------------
 AnnotRichMedia::AnnotRichMedia(PDFDoc *docA, PDFRectangle *rect) :
     Annot(docA, rect) {
-  Object obj1;
-
   type = typeRichMedia;
 
   annotObj.dictSet ("Subtype", Object(objName, "RichMedia"));
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index 69b88dc8..2864f2ae 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -394,7 +394,6 @@ CairoFreeTypeFont::~CairoFreeTypeFont() { }
 
 CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
                                             FT_Library lib, GBool useCIDs) {
-  Object refObj, strObj;
   GooString *fileName;
   char *fileNameC;
   char *font_data;
@@ -736,7 +735,6 @@ _render_type3_glyph (cairo_scaled_font_t  *scaled_font,
 CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc,
                                       CairoFontEngine *fontEngine,
                                       GBool printing, XRef *xref) {
-  Object refObj, strObj;
   type3_font_info_t *info;
   cairo_font_face_t *font_face;
   Ref ref;
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index d01b23d4..c423dea2 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -462,7 +462,6 @@ LinkDest *Catalog::getDestNameTreeDest(int i)
 
 FileSpec *Catalog::embeddedFile(int i)
 {
-    Object efDict;
     catalogLocker();
     Object *obj = getEmbeddedFileNameTree()->getValue(i);
     FileSpec *embeddedFile = nullptr;
diff --git a/poppler/Form.cc b/poppler/Form.cc
index 71397c4f..11b16c91 100644
--- a/poppler/Form.cc
+++ b/poppler/Form.cc
@@ -1433,7 +1433,7 @@ void FormFieldChoice::print(int indent)
 #endif
 
 void FormFieldChoice::updateSelection() {
-  Object objV, obj1;
+  Object objV;
   Object objI(objNull);
 
   if (edit && editedChoice) {
diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
index 2ed197d1..a5090838 100644
--- a/poppler/Lexer.cc
+++ b/poppler/Lexer.cc
@@ -86,7 +86,6 @@ Lexer::Lexer(XRef *xrefA, Object *obj) {
   xref = xrefA;
 
   if (obj->isStream()) {
-    Object obj2;
     streams = new Array(xref);
     freeArray = gTrue;
     streams->add(obj->copy());
diff --git a/poppler/Link.cc b/poppler/Link.cc
index 1bf57289..326cfb97 100644
--- a/poppler/Link.cc
+++ b/poppler/Link.cc
@@ -671,8 +671,6 @@ LinkRendition::LinkRendition(Object *obj) {
       if (!js && (operationCode < 0 || operationCode > 4)) {
         error(errSyntaxWarning, -1, "Invalid Rendition Action: unrecognized 
operation valued: {0:d}", operationCode);
       } else {
-        Object obj1;
-
         // retrieve rendition object
         renditionObj = obj->dictLookup("R");
         if (renditionObj.isDict()) {
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index 8aefc0b1..16b4d0f5 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -1547,7 +1547,6 @@ void PDFDoc::markDictionnary (Dict* dict, XRef * xRef, 
XRef *countRef, Guint num
     alreadyMarkedDicts->insert(dict);
   }
 
-  Object obj1;
   for (int i=0; i<dict->getLength(); i++) {
     const char *key = dict->getKey(i);
     if (strcmp(key, "Annots") != 0) {
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 94e3bc73..50b78245 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -1998,7 +1998,6 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
   SplashFontFile *fontFile;
   SplashFontSrc *fontsrc = nullptr;
   FoFiTrueType *ff;
-  Object refObj, strObj;
   GooString *fileName;
   char *tmpBuf;
   int tmpBufLen;
@@ -3765,7 +3764,6 @@ void SplashOutputDev::drawMaskedImage(GfxState *state, 
Object *ref,
                                      int maskHeight, GBool maskInvert,
                                      GBool maskInterpolate) {
   GfxImageColorMap *maskColorMap;
-  Object decodeLow, decodeHigh;
   double *ctm;
   SplashCoord mat[6];
   SplashOutMaskedImageData imgData;
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 3decd23c..183c29f0 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -1722,7 +1722,6 @@ void XRef::scanSpecialFlags() {
   }
 
   // Mark objects referred from the Encrypt dict as Unencrypted
-  Object obj = trailerDict.dictLookupNF("Encrypt");
   markUnencrypted();
 }
 
diff --git a/qt5/src/ArthurOutputDev.cc b/qt5/src/ArthurOutputDev.cc
index dccd07a8..6007ced7 100644
--- a/qt5/src/ArthurOutputDev.cc
+++ b/qt5/src/ArthurOutputDev.cc
@@ -439,7 +439,6 @@ void ArthurOutputDev::updateFont(GfxState *state)
   SplashFontFile *fontFile;
   SplashFontSrc *fontsrc = nullptr;
   FoFiTrueType *ff;
-  Object refObj, strObj;
   GooString *fileName;
   char *tmpBuf;
   int tmpBufLen = 0;
diff --git a/utils/JSInfo.cc b/utils/JSInfo.cc
index 6f2f41be..a67c3aeb 100644
--- a/utils/JSInfo.cc
+++ b/utils/JSInfo.cc
@@ -101,7 +101,6 @@ void JSInfo::scanJS(int nPages, FILE *fout, UnicodeMap 
*uMap) {
 void JSInfo::scan(int nPages) {
   Page *page;
   Annots *annots;
-  Object obj1, obj2;
   int lastPage;
 
   hasJS = gFalse;
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 12b63eed..985761e9 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -602,7 +602,6 @@ int main(int argc, char *argv[]) {
   GooString *fileName;
   GooString *ownerPW, *userPW;
   UnicodeMap *uMap;
-  Object info;
   FILE *f;
   GBool ok;
   int exitCode;
diff --git a/utils/pdfseparate.cc b/utils/pdfseparate.cc
index 4da3bba4..bfcd0748 100644
--- a/utils/pdfseparate.cc
+++ b/utils/pdfseparate.cc
@@ -145,7 +145,6 @@ static bool extractPages (const char *srcFileName, const 
char *destFileName) {
 int
 main (int argc, char *argv[])
 {
-  Object info;
   GBool ok;
   int exitCode;
 
_______________________________________________
poppler mailing list
poppler@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/poppler

Reply via email to