Commit e8b26474 authored by Scott Wheeler's avatar Scott Wheeler
Browse files

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

svn path=/branches/kpdf_experiments/kdegraphics/kpdf/; revision=366204
parent f956c09d
......@@ -2150,7 +2150,7 @@ void Gfx::opSetFont(Object args[], int /*numArgs*/) {
if (printCommands) {
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);
}
......@@ -2371,7 +2371,7 @@ void Gfx::doShowText(GString *s) {
state->transform(curX + riseX, curY + riseY, &x, &y);
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)) {
((Gfx8BitFont *)font)->getCharProc(code, &charProc);
......
......@@ -15,7 +15,7 @@
#include <string.h>
#include <stdio.h>
#include <ctype.h>
#if HAVE_PAPER_H
#ifdef HAVE_PAPER_H
#include <paper.h>
#endif
#include "gmem.h"
......@@ -183,7 +183,7 @@ GlobalParams::GlobalParams(const char *cfgFileName) {
displayFonts = new GHash();
displayCIDFonts = new GHash();
displayNamedCIDFonts = new GHash();
#if HAVE_PAPER_H
#ifdef HAVE_PAPER_H
char *paperName;
const struct paper *paperType;
paperinit();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment