diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | glib/test-poppler-glib.c | 5 | ||||
| -rw-r--r-- | poppler/FontInfo.cc | 2 | ||||
| -rw-r--r-- | utils/HtmlOutputDev.cc | 2 | ||||
| -rw-r--r-- | utils/ImageOutputDev.cc | 2 | ||||
| -rw-r--r-- | utils/pdffonts.cc | 2 | ||||
| -rw-r--r-- | utils/pdfimages.cc | 2 | ||||
| -rw-r--r-- | utils/pdfinfo.cc | 2 | ||||
| -rw-r--r-- | utils/pdftohtml.cc | 4 | ||||
| -rw-r--r-- | utils/pdftoppm.cc | 2 | ||||
| -rw-r--r-- | utils/pdftops.cc | 2 | ||||
| -rw-r--r-- | utils/pdftotext.cc | 2 |
12 files changed, 19 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2006-01-23 Kristian Høgsberg <krh@redhat.com> + * glib/test-poppler-glib.c (print_document_info, print_index): + Move variable declarations to top (#5692). + + * utils/*.cc: Move config.h #include to top of #include's (#5693). + * splash/SplashFTFont.cc: Don't use deprecated freetype include files. diff --git a/glib/test-poppler-glib.c b/glib/test-poppler-glib.c index c48a2654..1c480a32 100644 --- a/glib/test-poppler-glib.c +++ b/glib/test-poppler-glib.c @@ -13,11 +13,12 @@ print_index (PopplerIndexIter *iter) do { PopplerAction *action; + PopplerIndexIter *child; action = poppler_index_iter_get_action (iter); g_print ("Action: %d\n", action->type); poppler_action_free (action); - PopplerIndexIter *child = poppler_index_iter_get_child (iter); + child = poppler_index_iter_get_child (iter); if (child) print_index (child); poppler_index_iter_free (child); @@ -35,6 +36,7 @@ print_document_info (PopplerDocument *document) PopplerViewerPreferences view_prefs; PopplerFontInfo *font_info; PopplerFontsIter *fonts_iter; + PopplerIndexIter *index_iter; GEnumValue *enum_value; g_object_get (document, @@ -85,7 +87,6 @@ print_document_info (PopplerDocument *document) } poppler_font_info_free (font_info); - PopplerIndexIter *index_iter; index_iter = poppler_index_iter_new (document); if (index_iter) { diff --git a/poppler/FontInfo.cc b/poppler/FontInfo.cc index a140becd..335ce5ca 100644 --- a/poppler/FontInfo.cc +++ b/poppler/FontInfo.cc @@ -1,3 +1,4 @@ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> @@ -10,7 +11,6 @@ #include "GfxFont.h" #include "Annot.h" #include "PDFDoc.h" -#include "config.h" #include "FontInfo.h" #include "UGooString.h" diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc index 6947064f..9816c4c2 100644 --- a/utils/HtmlOutputDev.cc +++ b/utils/HtmlOutputDev.cc @@ -14,6 +14,7 @@ #pragma implementation #endif +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -24,7 +25,6 @@ #include "goo/GooList.h" #include "UnicodeMap.h" #include "goo/gmem.h" -#include "config.h" #include "Error.h" #include "GfxState.h" #ifdef ENABLE_LIBJPEG diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc index e95b6b95..04e46467 100644 --- a/utils/ImageOutputDev.cc +++ b/utils/ImageOutputDev.cc @@ -6,6 +6,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #ifdef USE_GCC_PRAGMAS @@ -17,7 +18,6 @@ #include <stddef.h> #include <ctype.h> #include "goo/gmem.h" -#include "config.h" #include "Error.h" #include "GfxState.h" #include "Object.h" diff --git a/utils/pdffonts.cc b/utils/pdffonts.cc index faa04ddb..abd4da64 100644 --- a/utils/pdffonts.cc +++ b/utils/pdffonts.cc @@ -6,6 +6,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #include <stdio.h> #include <stdlib.h> @@ -22,7 +23,6 @@ #include "GfxFont.h" #include "Annot.h" #include "PDFDoc.h" -#include "config.h" #include "UGooString.h" static char *fontTypeNames[] = { diff --git a/utils/pdfimages.cc b/utils/pdfimages.cc index be020ec8..0d4804ae 100644 --- a/utils/pdfimages.cc +++ b/utils/pdfimages.cc @@ -8,6 +8,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #include <stdio.h> #include <stdlib.h> @@ -27,7 +28,6 @@ #include "PDFDoc.h" #include "ImageOutputDev.h" #include "Error.h" -#include "config.h" static int firstPage = 1; static int lastPage = 0; diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc index 8ba5f819..81c800c8 100644 --- a/utils/pdfinfo.cc +++ b/utils/pdfinfo.cc @@ -6,6 +6,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #include <stdio.h> #include <stdlib.h> @@ -29,7 +30,6 @@ #include "UnicodeMap.h" #include "Error.h" #include "UGooString.h" -#include "config.h" static void printInfoString(Dict *infoDict, char *key, char *text, UnicodeMap *uMap); diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc index 18567aab..caaf8c36 100644 --- a/utils/pdftohtml.cc +++ b/utils/pdftohtml.cc @@ -6,12 +6,13 @@ // Copyright 1999-2000 G. Ovtcharov //======================================================================== +#include "config.h" +#include <poppler-config.h> #include <stdio.h> #include <stdlib.h> #include <stddef.h> #include <string.h> #include <dirent.h> -#include <poppler-config.h> #include <time.h> #include "parseargs.h" #include "goo/GooString.h" @@ -29,7 +30,6 @@ #include "GlobalParams.h" #include "Error.h" #include "UGooString.h" -#include "config.h" #include "goo/gfile.h" #ifndef GHOSTSCRIPT diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc index ba153b72..d95c1798 100644 --- a/utils/pdftoppm.cc +++ b/utils/pdftoppm.cc @@ -6,6 +6,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #include <stdio.h> #include "parseargs.h" @@ -17,7 +18,6 @@ #include "splash/SplashBitmap.h" #include "splash/Splash.h" #include "SplashOutputDev.h" -#include "config.h" static int firstPage = 1; static int lastPage = 0; diff --git a/utils/pdftops.cc b/utils/pdftops.cc index 308a6e0b..3ff207b9 100644 --- a/utils/pdftops.cc +++ b/utils/pdftops.cc @@ -8,6 +8,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #include <stdio.h> #include <stdlib.h> @@ -27,7 +28,6 @@ #include "PDFDoc.h" #include "PSOutputDev.h" #include "Error.h" -#include "config.h" static int firstPage = 1; static int lastPage = 0; diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc index 2ac603eb..b0293149 100644 --- a/utils/pdftotext.cc +++ b/utils/pdftotext.cc @@ -8,6 +8,7 @@ // //======================================================================== +#include "config.h" #include <poppler-config.h> #include <stdio.h> #include <stdlib.h> @@ -30,7 +31,6 @@ #include "UnicodeMap.h" #include "Error.h" #include "UGooString.h" -#include "config.h" static void printInfoString(FILE *f, Dict *infoDict, char *key, char *text1, char *text2, UnicodeMap *uMap); |