poppler/Annot.h | 6 +++--- poppler/GfxState.h | 6 +++--- poppler/TextOutputDev.h | 6 +++--- splash/SplashScreen.cc | 2 +- utils/pdfinfo.cc | 4 +++- 5 files changed, 13 insertions(+), 11 deletions(-)
New commits: commit 0d06c871df8065e72ae54a1821ca9e872a554352 Author: Albert Astals Cid <[email protected]> Date: Tue Sep 6 23:42:55 2016 +0200 Make some classes smaller in memory (amd64) Thanks to elf-dissector TextWord 176 -> 160 Annot 256 -> 240 GfxShading 200 -> 184 diff --git a/poppler/Annot.h b/poppler/Annot.h index dfafe4f..02311cb 100644 --- a/poppler/Annot.h +++ b/poppler/Annot.h @@ -651,9 +651,9 @@ protected: // Delete appearance streams and reset appearance state void invalidateAppearance(); - int refCnt; - Object annotObj; + + int refCnt; // required data AnnotSubtype type; // Annotation type @@ -661,9 +661,9 @@ protected: // optional data GooString *contents; // Contents - int page; // P GooString *name; // NM GooString *modified; // M + int page; // P Guint flags; // F (must be a 32 bit unsigned int) AnnotAppearance *appearStreams; // AP Object appearance; // a reference to the Form XObject stream diff --git a/poppler/GfxState.h b/poppler/GfxState.h index d359355..3888871 100644 --- a/poppler/GfxState.h +++ b/poppler/GfxState.h @@ -17,7 +17,7 @@ // Copyright (C) 2006, 2007 Jeff Muizelaar <[email protected]> // Copyright (C) 2006 Carlos Garcia Campos <[email protected]> // Copyright (C) 2009 Koji Otani <[email protected]> -// Copyright (C) 2009-2011, 2013 Albert Astals Cid <[email protected]> +// Copyright (C) 2009-2011, 2013, 2016 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Christian Feuersänger <[email protected]> // Copyright (C) 2011 Andrea Canciani <[email protected]> // Copyright (C) 2011-2014, 2016 Thomas Freitag <[email protected]> @@ -861,11 +861,11 @@ protected: GBool init(GfxResources *res, Dict *dict, OutputDev *out, GfxState *state); int type; + GBool hasBackground; + GBool hasBBox; GfxColorSpace *colorSpace; GfxColor background; - GBool hasBackground; double xMin, yMin, xMax, yMax; - GBool hasBBox; }; //------------------------------------------------------------------------ diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h index 7da797c..005be45 100644 --- a/poppler/TextOutputDev.h +++ b/poppler/TextOutputDev.h @@ -17,7 +17,7 @@ // Copyright (C) 2006 Ed Catmur <[email protected]> // Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <[email protected]> // Copyright (C) 2007 Adrian Johnson <[email protected]> -// Copyright (C) 2008, 2010, 2015 Albert Astals Cid <[email protected]> +// Copyright (C) 2008, 2010, 2015, 2016 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Brian Ewins <[email protected]> // Copyright (C) 2012, 2013, 2015, 2016 Jason Crain <[email protected]> // Copyright (C) 2013 Thomas Freitag <[email protected]> @@ -194,6 +194,7 @@ private: int rot; // rotation, multiple of 90 degrees // (0, 1, 2, or 3) + int wMode; // horizontal (0) or vertical (1) writing mode double xMin, xMax; // bounding box x coordinates double yMin, yMax; // bounding box y coordinates double base; // baseline x or y coordinate @@ -211,8 +212,8 @@ private: double fontSize; // font size GBool spaceAfter; // set if there is a space between this // word and the next word on the line + GBool underlined; TextWord *next; // next word in line - int wMode; // horizontal (0) or vertical (1) writing mode #if TEXTOUT_WORD_LIST double colorR, // word color @@ -220,7 +221,6 @@ private: colorB; #endif - GBool underlined; AnnotLink *link; friend class TextPool; commit 3ccd1c34a19c81d92bff27a095cf912afecb5ef3 Author: Albert Astals Cid <[email protected]> Date: Tue Sep 6 23:42:03 2016 +0200 Compile++ diff --git a/splash/SplashScreen.cc b/splash/SplashScreen.cc index 9b0a267..28b1e79 100644 --- a/splash/SplashScreen.cc +++ b/splash/SplashScreen.cc @@ -378,7 +378,7 @@ SplashScreen::SplashScreen(SplashScreen *screen) { sizeM1 = screen->sizeM1; log2Size = screen->log2Size; mat = (Guchar *)gmallocn(size * size, sizeof(Guchar)); - if (likely(mat)) { + if (likely(mat != NULL)) { memcpy(mat, screen->mat, size * size * sizeof(Guchar)); } minVal = screen->minVal; commit 2ece00c84418fb8a92acc44d2bd0b001bfa10b27 Author: Albert Astals Cid <[email protected]> Date: Tue Sep 6 23:41:42 2016 +0200 Fix warning about new enum diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc index bffd67f..9cfdc0f 100644 --- a/utils/pdfinfo.cc +++ b/utils/pdfinfo.cc @@ -15,7 +15,7 @@ // under GPL version 2 or later // // Copyright (C) 2006 Dom Lachowicz <[email protected]> -// Copyright (C) 2007-2010, 2012 Albert Astals Cid <[email protected]> +// Copyright (C) 2007-2010, 2012, 2016 Albert Astals Cid <[email protected]> // Copyright (C) 2010 Hib Eris <[email protected]> // Copyright (C) 2011 Vittal Aithal <[email protected]> // Copyright (C) 2012, 2013, 2016 Adrian Johnson <[email protected]> @@ -373,6 +373,8 @@ void printInfo(PDFDoc *doc, UnicodeMap *uMap, long long filesize, GBool multiPag case cryptAES256: encAlgorithmName = "AES-256"; break; + case cryptNone: + break; } printf("yes (print:%s copy:%s change:%s addNotes:%s algorithm:%s)\n",
_______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
