]>
Commit | Line | Data |
---|---|---|
2c2efdad JB |
1 | --- swftools-0.9.2/lib/pdf/BitmapOutputDev.cc.orig 2014-06-21 08:53:04.062950171 +0200 |
2 | +++ swftools-0.9.2/lib/pdf/BitmapOutputDev.cc 2014-06-21 09:14:39.449589839 +0200 | |
3 | @@ -998,11 +998,11 @@ | |
4 | ||
5 | void BitmapOutputDev::beginPage(GfxState *state, int pageNum) | |
6 | { | |
7 | - rgbdev->startPage(pageNum, state); | |
8 | - boolpolydev->startPage(pageNum, state); | |
9 | - booltextdev->startPage(pageNum, state); | |
10 | - clip0dev->startPage(pageNum, state); | |
11 | - clip1dev->startPage(pageNum, state); | |
12 | + rgbdev->startPage(pageNum, state, NULL); | |
13 | + boolpolydev->startPage(pageNum, state, NULL); | |
14 | + booltextdev->startPage(pageNum, state, NULL); | |
15 | + clip0dev->startPage(pageNum, state, NULL); | |
16 | + clip1dev->startPage(pageNum, state, NULL); | |
17 | gfxdev->startPage(pageNum, state); | |
18 | ||
19 | boolpolybitmap = boolpolydev->getBitmap(); | |
20 | --- swftools-0.9.2/lib/pdf/FullBitmapOutputDev.cc.orig 2014-06-21 08:53:04.066283501 +0200 | |
21 | +++ swftools-0.9.2/lib/pdf/FullBitmapOutputDev.cc 2014-06-21 09:15:29.096255472 +0200 | |
22 | @@ -192,7 +192,7 @@ | |
23 | void FullBitmapOutputDev::beginPage(GfxState *state, int pageNum) | |
24 | { | |
25 | msg("<debug> startPage"); | |
26 | - rgbdev->startPage(pageNum, state); | |
27 | + rgbdev->startPage(pageNum, state, NULL); | |
28 | gfxdev->startPage(pageNum, state); | |
29 | } | |
30 | ||
31 | --- swftools-0.9.2/lib/pdf/XMLOutputDev.cc.orig 2014-06-21 08:53:04.072950171 +0200 | |
32 | +++ swftools-0.9.2/lib/pdf/XMLOutputDev.cc 2014-06-21 09:31:00.109569398 +0200 | |
33 | @@ -46,7 +46,7 @@ | |
34 | ||
35 | void XMLOutputDev::startPage(int pageNum, GfxState *state) | |
36 | { | |
37 | - TextOutputDev::startPage(pageNum, state); | |
38 | + TextOutputDev::startPage(pageNum, state, NULL); | |
39 | fprintf(out, "<page nr=\"%d\" width=\"%.0f\" height=\"%.0f\">\n", pageNum, | |
40 | state->getPageWidth(), state->getPageHeight()); | |
41 | } | |
42 | @@ -67,7 +67,7 @@ | |
43 | double color_b = -1; | |
44 | for(i=0;i<len;i++) { | |
45 | TextWord*word = list->get(i); | |
46 | - GString*newfont = word->getFontName(); | |
47 | + GString*newfont = word->getFontName(0); | |
48 | double newsize = word->getFontSize(); | |
49 | #ifdef HAVE_POPPLER | |
50 | double newbase = word->getBaseline(); | |
51 | @@ -87,7 +87,7 @@ | |
52 | newcolor_b != color_b | |
53 | ) | |
54 | { | |
55 | - TextFontInfo*info = word->getFontInfo(); | |
56 | + TextFontInfo*info = word->getFontInfo(0); | |
57 | if(textTag) | |
58 | fprintf(out, "</t>\n"); | |
59 | textTag = 1; | |
60 | --- swftools-0.9.2/lib/pdf/pdf.cc.orig 2014-06-21 10:48:46.916138792 +0200 | |
61 | +++ swftools-0.9.2/lib/pdf/pdf.cc 2014-06-21 10:48:54.919471960 +0200 | |
62 | @@ -375,7 +375,7 @@ | |
63 | else if(!strcmp(name, "creationdate")) return getInfoDate(i->docinfo.getDict(), "CreationDate"); | |
64 | else if(!strcmp(name, "moddate")) return getInfoDate(i->docinfo.getDict(), "ModDate"); | |
65 | else if(!strcmp(name, "linearized")) return strdup(i->doc->isLinearized() ? "yes" : "no"); | |
66 | - else if(!strcmp(name, "tagged")) return strdup(i->doc->getStructTreeRoot()->isDict() ? "yes" : "no"); | |
67 | + else if(!strcmp(name, "tagged")) return strdup((i->doc->getCatalog()->getMarkInfo() & Catalog::markInfoMarked) ? "yes" : "no"); | |
68 | else if(!strcmp(name, "encrypted")) return strdup(i->doc->isEncrypted() ? "yes" : "no"); | |
69 | else if(!strcmp(name, "oktoprint")) return strdup(i->doc->okToPrint() ? "yes" : "no"); | |
70 | else if(!strcmp(name, "oktocopy")) return strdup(i->doc->okToCopy() ? "yes" : "no"); |