From kde-commits  Thu Nov 25 19:43:04 2004
From: Scott Wheeler <wheeler () kde ! org>
Date: Thu, 25 Nov 2004 19:43:04 +0000
To: kde-commits
Subject: kpdf_experiments: kdegraphics/kpdf/xpdf
Message-Id: <20041125194304.C6D711CF72 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110141179209279

CVS commit by wheeler: 

Remove trigraphs, switch to #ifdef where a #if was mistakenly used.


  M +2 -2      Gfx.cc   1.6.2.1
  M +2 -2      GlobalParams.cc   1.7.2.2


--- kdegraphics/kpdf/xpdf/Gfx.cc  #1.6:1.6.2.1
@@ -2151,5 +2151,5 @@ void Gfx::opSetFont(Object args[], int /
     printf("  font: tag=%s name='%s' %g\n",
            font->getTag()->getCString(),
-           font->getName() ? font->getName()->getCString() : "???",
+           font->getName() ? font->getName()->getCString() : "\?\?\?",
            args[1].getNum());
     fflush(stdout);
@@ -2372,5 +2372,5 @@ void Gfx::doShowText(GString *s) {
       saveState();
       state->setCTM(newCTM[0], newCTM[1], newCTM[2], newCTM[3], x, y);
-      //~ out->updateCTM(???)
+      //~ out->updateCTM(\?\?\?)
       if (!out->beginType3Char(state, curX + riseX, curY + riseY, tdx, tdy,
                                code, u, uLen)) {

--- kdegraphics/kpdf/xpdf/GlobalParams.cc  #1.7.2.1:1.7.2.2
@@ -16,5 +16,5 @@
 #include <stdio.h>
 #include <ctype.h>
-#if HAVE_PAPER_H
+#ifdef HAVE_PAPER_H
 #include <paper.h>
 #endif
@@ -184,5 +184,5 @@ GlobalParams::GlobalParams(const char *c
   displayCIDFonts = new GHash();
   displayNamedCIDFonts = new GHash();
-#if HAVE_PAPER_H
+#ifdef HAVE_PAPER_H
   char *paperName;
   const struct paper *paperType;