Make some classes smaller in memory (amd64)

Thanks to elf-dissector

TextWord 176 -> 160
Annot 256 -> 240
GfxShading 200 -> 184

3 files changed, 9 insertions, 9 deletions

diff --git a/poppler/Annot.h b/poppler/Annot.h
index dfafe4f9..02311cb4 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 d3593550..38888717 100644
--- a/poppler/GfxState.h
+++ b/poppler/GfxState.h
@@ -17,7 +17,7 @@
 // Copyright (C) 2006, 2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2006 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2009 Koji Otani <sho@bbr.jp>
-// Copyright (C) 2009-2011, 2013 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2009-2011, 2013, 2016 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Christian Feuersänger <cfeuersaenger@googlemail.com>
 // Copyright (C) 2011 Andrea Canciani <ranma42@gmail.com>
 // Copyright (C) 2011-2014, 2016 Thomas Freitag <Thomas.Freitag@alfa.de>
@@ -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 7da797c2..005be45f 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -17,7 +17,7 @@
 // Copyright (C) 2006 Ed Catmur <ed@catmur.co.uk>
 // Copyright (C) 2007, 2008, 2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007 Adrian Johnson <ajohnson@redneon.com>
-// Copyright (C) 2008, 2010, 2015 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2008, 2010, 2015, 2016 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2010 Brian Ewins <brian.ewins@gmail.com>
 // Copyright (C) 2012, 2013, 2015, 2016 Jason Crain <jason@aquaticape.us>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
@@ -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;