Commit 13e8356a authored by Christophe Devriese's avatar Christophe Devriese
Browse files

patch from uga committed

svn path=/trunk/kdegraphics/kpdf/; revision=242596
parent 32398f0f
// QOutputDevPixmap.h
// Copyright (C) 2003 Christophe Devriese <oelewapperke@oelewapperke.org>
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
// 02111-1307 USA
//========================================================================
//
......
......@@ -554,7 +554,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, char *tagA, Ref idA, GString *nameA,
embFontName = new GString(fontFile->getName());
}
if (!baseEnc) {
baseEnc = fontFile->getEncoding();
baseEnc = (const char**) fontFile->getEncoding();
baseEncFromFontFile = gTrue;
}
gfree(buf);
......@@ -575,7 +575,7 @@ Gfx8BitFont::Gfx8BitFont(XRef *xref, char *tagA, Ref idA, GString *nameA,
// copy the base encoding
for (i = 0; i < 256; ++i) {
enc[i] = baseEnc[i];
enc[i] = (char *) baseEnc[i];
if ((encFree[i] = baseEncFromFontFile) && enc[i]) {
enc[i] = copyString(baseEnc[i]);
}
......
......@@ -41,7 +41,7 @@ NameToCharCode::~NameToCharCode() {
for (i = 0; i < size; ++i) {
if (tab[i].name) {
gfree(tab[i].name);
gfree((void *) (tab[i].name));
}
}
gfree(tab);
......
......@@ -678,12 +678,12 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
writePS("%%BeginProlog\n");
}
writePSFmt("%%%%BeginResource: procset xpdf %s 0\n", xpdfVersion);
for (p = prolog; *p; ++p) {
for (p = (char **) prolog; *p; ++p) {
writePSFmt("%s\n", *p);
}
writePS("%%EndResource\n");
if (level >= psLevel3) {
for (p = cmapProlog; *p; ++p) {
for (p = (char **) cmapProlog; *p; ++p) {
writePSFmt("%s\n", *p);
}
}
......@@ -969,7 +969,7 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
if (name) {
for (i = 0; psFonts[i]; ++i) {
if (name->cmp(psFonts[i]) == 0) {
psName = psFonts[i];
psName = (char *) psFonts[i];
break;
}
}
......@@ -988,7 +988,7 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
if (font->isItalic()) {
i += 1;
}
psName = psSubstFonts[i].psName;
psName = (char *) psSubstFonts[i].psName;
for (code = 0; code < 256; ++code) {
if ((charName = ((Gfx8BitFont *)font)->getCharName(code)) &&
charName[0] == 'm' && charName[1] == '\0') {
......@@ -3289,7 +3289,7 @@ void PSOutputDev::writePSName(const char *s) {
char *p;
char c;
p = s;
p = (char *) s;
while ((c = *p++)) {
if (c <= (char)0x20 || c >= (char)0x7f ||
c == '(' || c == ')' || c == '<' || c == '>' ||
......
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