diff -ur kpdf-3.5.1.orig/kpdf/core/generator_pdf/generator_pdf.cpp kpdf-3.5.1/kpdf/core/generator_pdf/generator_pdf.cpp --- kpdf-3.5.1.orig/kpdf/core/generator_pdf/generator_pdf.cpp 2006-03-04 12:30:58.000000000 +0100 +++ kpdf-3.5.1/kpdf/core/generator_pdf/generator_pdf.cpp 2006-03-04 12:55:02.000000000 +0100 @@ -37,6 +37,7 @@ #include "poppler/UnicodeMap.h" #include "poppler/Outline.h" #include "poppler/goo/GooString.h" +#include "poppler/UGooString.h" #include "poppler/goo/GooList.h" //#include "poppler/poppler-qt.h" @@ -392,7 +393,7 @@ { if (annots->getAnnot(i)->getAppearance(&obj1)->isStream()) { - obj1.streamGetDict()->lookup("Resources", &obj2); + obj1.streamGetDict()->lookup((UGooString&) "Resources", &obj2); if (obj2.isDict()) { scanFonts(obj2.getDict(), list, &fonts, fontsLen, fontsSize); @@ -493,7 +494,7 @@ DocumentViewport viewport; GooString * namedDest = QStringToUGString( option ); docLock.lock(); - LinkDest * destination = pdfdoc->findDest( namedDest ); + LinkDest * destination = pdfdoc->findDest((UGooString*) namedDest ); if ( destination ) { fillViewportFromLink( viewport, destination ); @@ -553,7 +554,7 @@ // scan the fonts in this resource dictionary gfxFontDict = NULL; - resDict->lookupNF("Font", &obj1); + resDict->lookupNF((UGooString&) "Font", &obj1); if (obj1.isRef()) { obj1.fetch(pdfdoc->getXRef(), &obj2); @@ -580,7 +581,7 @@ // recursively scan any resource dictionaries in objects in this // resource dictionary - resDict->lookup("XObject", &xObjDict); + resDict->lookup((UGooString&) "XObject", &xObjDict); if (xObjDict.isDict()) { for (i = 0; i < xObjDict.dictGetLength(); ++i) @@ -588,7 +589,7 @@ xObjDict.dictGetVal(i, &xObj); if (xObj.isStream()) { - xObj.streamGetDict()->lookup("Resources", &resObj); + xObj.streamGetDict()->lookup((UGooString&) "Resources", &resObj); if (resObj.isDict()) scanFonts(resObj.getDict(), list, fonts, fontsLen, fontsSize); resObj.free(); } @@ -688,7 +689,7 @@ int i; Dict *infoDict = info.getDict(); - if ( infoDict->lookup( (char*) data.latin1(), &obj )->isString() ) + if ( infoDict->lookup(UGooString(data.latin1()), &obj )->isString() ) { s1 = obj.getString(); if ( ( s1->getChar(0) & 0xff ) == 0xfe && ( s1->getChar(1) & 0xff ) == 0xff ) @@ -746,7 +747,7 @@ if ( !uMap ) return i18n( "Unknown Date" ); - if ( infoDict->lookup( (char*) data.latin1(), &obj )->isString() ) + if ( infoDict->lookup(UGooString(data.latin1()), &obj )->isString() ) { s = obj.getString()->getCString(); if ( s[0] == 'D' && s[1] == ':' ) @@ -802,7 +803,7 @@ // get the destination for the page now, but it's VERY time consuming, // so better storing the reference and provide the viewport as metadata // on demand - GooString *s = g->getNamedDest(); + GooString *s = (GooString*) g->getNamedDest(); QString aux = QString(s->getCString()); item.setAttribute( "ViewportName", aux ); } diff -ur kpdf-3.5.1.orig/kpdf/core/generator_pdf/gp_outputdev.cpp kpdf-3.5.1/kpdf/core/generator_pdf/gp_outputdev.cpp --- kpdf-3.5.1.orig/kpdf/core/generator_pdf/gp_outputdev.cpp 2006-03-04 12:30:58.000000000 +0100 +++ kpdf-3.5.1/kpdf/core/generator_pdf/gp_outputdev.cpp 2006-03-04 12:56:59.000000000 +0100 @@ -246,7 +246,7 @@ { LinkGoTo * g = (LinkGoTo *) a; // ceate link: no ext file, namedDest, object pointer - link = new KPDFLinkGoto( QString::null, decodeViewport( g->getNamedDest(), g->getDest() ) ); + link = new KPDFLinkGoto( QString::null, decodeViewport((GooString*) g->getNamedDest(), g->getDest() ) ); } break; @@ -256,7 +256,7 @@ // copy link file const char * fileName = g->getFileName()->getCString(); // ceate link: fileName, namedDest, object pointer - link = new KPDFLinkGoto( (QString)fileName, decodeViewport( g->getNamedDest(), g->getDest() ) ); + link = new KPDFLinkGoto( (QString)fileName, decodeViewport((GooString*) g->getNamedDest(), g->getDest() ) ); } break; @@ -327,7 +327,7 @@ DocumentViewport vp( -1 ); if ( namedDest && !dest ) - dest = m_doc->findDest( namedDest ); + dest = m_doc->findDest((UGooString*) namedDest ); if ( !dest || !dest->isOk() ) return vp;