From: Matthias Kramm <kramm@quiss.org>
Date: Mon, 24 Aug 2009 11:11:57 +0000 (+0200)
Subject: also, use /etc/xpdf/xpdfrc, instead of /etc/xpdfrc
X-Git-Tag: version-0-9-1~294
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=1c806da0dba560e9da67b85a3645cd1537742ead

also, use /etc/xpdf/xpdfrc, instead of /etc/xpdfrc
---

diff --git a/lib/pdf/GFXOutputDev.cc b/lib/pdf/GFXOutputDev.cc
index 2f4a2cf..7f11936 100644
--- a/lib/pdf/GFXOutputDev.cc
+++ b/lib/pdf/GFXOutputDev.cc
@@ -589,6 +589,7 @@ GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
     this->user_clipy1 = 0;
     this->user_clipx2 = 0;
     this->user_clipy2 = 0;
+    this->current_gfxfont = 0;
     this->current_fontinfo = 0;
     this->current_text_stroke = 0;
     this->current_text_clip = 0;
@@ -1227,7 +1228,7 @@ void GFXOutputDev::fillGfxLine(GfxState *state, gfxline_t*line, char evenodd)
     gfxcolor_t col = getFillColor(state);
 
     if(getLogLevel() >= LOGLEVEL_TRACE)  {
-        msg("<trace> %sfill %02x%02x%02x%02x%s", evenodd?"eo":"", col.r, col.g, col.b, col.a);
+        msg("<trace> %sfill %02x%02x%02x%02x", evenodd?"eo":"", col.r, col.g, col.b, col.a);
         dump_outline(line);
     }
     device->fill(device, line, &col);
diff --git a/lib/pdf/aconf.h b/lib/pdf/aconf.h
index 524ccee..61878ec 100644
--- a/lib/pdf/aconf.h
+++ b/lib/pdf/aconf.h
@@ -9,6 +9,8 @@
 #define ACONF_H
 #include "../../config.h"
 
+#define SYSTEM_XPDFRC "/etc/xpdf/xpdfrc"
+
 #define HAVE_STRINGS_H 1
 
 // todo: