device->fill(device, clippath, &white);
}
-#if xpdfUpdateVersion >= 16
+
void GFXOutputDev::processLink(Link *link, Catalog *catalog)
-#else
-void GFXOutputDev::drawLink(Link *link, Catalog *catalog)
-#endif
{
double x1, y1, x2, y2, w;
gfxline_t points[5];
}
FoFiType1C *cvt = FoFiType1C::make(fontBuf, fontLen);
if(!cvt) return 0;
- cvt->convertToType1(NULL, gTrue, FoFiWrite, f);
+ cvt->convertToType1(0, NULL, gTrue, FoFiWrite, f);
//cvt->convertToCIDType0("test", f);
//cvt->convertToType0("test", f);
delete cvt;
void setXRef(PDFDoc*doc, XRef *xref);
//----- link borders
-#if xpdfUpdateVersion >= 16
virtual void processLink(Link *link, Catalog *catalog);
-#else
- virtual void drawLink(Link *link, Catalog *catalog);
-#endif
//----- save/restore graphics state
virtual void saveState(GfxState *state) ;
$(CC) -I ./ -I xpdf xpdf/GHash.cc -o $@
xpdf/gfile.$(O): xpdf/gfile.cc
$(CC) -I ./ -I xpdf xpdf/gfile.cc -o $@
-xpdf/gmem.$(O): xpdf/gmem.c
- $(C) -I ./ -I xpdf xpdf/gmem.c -o $@
+xpdf/gmem.$(O): xpdf/gmem.cc
+ $(C) -I ./ -I xpdf xpdf/gmem.cc -o $@
../libpdf$(A): $(libpdf_objects) $(xpdf_objects)
$(AR) r ../libpdf$(A) $(libpdf_objects) $(xpdf_objects)
print fi <<EOF
#!/bin/sh
-if test "x\$1" = "xstable";then
+VERSION=$1
+PS3="choose> "
+
+if test "x$VERSION" = "x";then
+ select V in stable latest;do VERSION="$V";break;done
+fi
+
+if test "x\$VERSION" = "xstable";then
echo "Switching to stable version"
rm -f xpdf
- ln -s xpdf-3.01 xpdf
-elif test "x\$1" = "xlatest";then
+ ln -s xpdf-3.02 xpdf
+elif test "x\$VERSION" = "xlatest";then
echo "Switching to latest version"
rm -f xpdf
ln -s $directory xpdf
pi->outputDev->setInfo(pi->info);
pi->outputDev->setXRef(pi->doc, pi->doc->getXRef());
pi->doc->displayPage((OutputDev*)pi->outputDev, page->nr, zoom, zoom, /*rotate*/0, true, true, /*doLinks*/(int)1);
+ pi->doc->processLinks((OutputDev*)pi->outputDev, page->nr);
}
-Index: FoFiType1C.cc
-===================================================================
-RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/FoFiType1C.cc,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- FoFiType1C.cc 3 Dec 2005 10:11:33 -0000 1.3
-+++ FoFiType1C.cc 3 Dec 2005 10:30:41 -0000 1.4
-@@ -231,8 +231,11 @@
- (*outputFunc)(outputStream,
- "0 1 255 {1 index exch /.notdef put} for\n", 40);
- enc = newEncoding ? newEncoding : encoding;
-+ if(!enc) {
-+ fprintf(stderr, "convertToType1: Warning: No Encoding\n");
-+ }
- for (i = 0; i < 256; ++i) {
-- if (enc[i]) {
-+ if (enc && enc[i]) {
- sprintf(buf, "dup %d /%s put\n", i, enc[i]);
- (*outputFunc)(outputStream, buf, strlen(buf));
- }
Index: Gfx.cc
===================================================================
RCS file: /home/kramm/cvs/swftools.cache.cvsroot/swftools.cache/pdf2swf/xpdf/Gfx.cc,v