git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
re-added copy check
[swftools.git]
/
lib
/
pdf
/
pdf.cc
diff --git
a/lib/pdf/pdf.cc
b/lib/pdf/pdf.cc
index
08fb178
..
840a8da
100644
(file)
--- a/
lib/pdf/pdf.cc
+++ b/
lib/pdf/pdf.cc
@@
-133,6
+133,11
@@
static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1,
pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
gfxsource_internal_t*i = (gfxsource_internal_t*)pi->parent->internal;
pdf_doc_internal_t*pi = (pdf_doc_internal_t*)page->parent->internal;
gfxsource_internal_t*i = (gfxsource_internal_t*)pi->parent->internal;
+ if(pi->nocopy) {
+ msg("<fatal> PDF disallows copying");
+ exit(0);
+ }
+
CommonOutputDev*outputDev = 0;
if(pi->config_full_bitmap_optimizing) {
FullBitmapOutputDev*d = new FullBitmapOutputDev(pi->info, pi->doc);
CommonOutputDev*outputDev = 0;
if(pi->config_full_bitmap_optimizing) {
FullBitmapOutputDev*d = new FullBitmapOutputDev(pi->info, pi->doc);
@@
-150,6
+155,12
@@
static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1,
outputDev->setParameter(p->name, p->value);
p = p->next;
}
outputDev->setParameter(p->name, p->value);
p = p->next;
}
+ p = pi->parameters.device_config;
+ while(p) {
+ outputDev->setParameter(p->name, p->value);
+ p = p->next;
+ }
+
outputDev->setPageMap(pi->pagemap, pi->pagemap_pos);
outputDev->setMove(x,y);
outputDev->setClip(x1,y1,x2,y2);
outputDev->setPageMap(pi->pagemap, pi->pagemap_pos);
outputDev->setMove(x,y);
outputDev->setClip(x1,y1,x2,y2);
@@
-182,11
+193,13
@@
static void render2(gfxpage_t*page, gfxdevice_t*dev, int x,int y, int x1,int y1,
pi->doc->processLinks((OutputDev*)outputDev, page->nr);
outputDev->finishPage();
outputDev->setDevice(0);
pi->doc->processLinks((OutputDev*)outputDev, page->nr);
outputDev->finishPage();
outputDev->setDevice(0);
+ delete outputDev;
if(middev) {
gfxdevice_rescale_setdevice(middev, 0x00000000);
middev->finish(middev);
}
if(middev) {
gfxdevice_rescale_setdevice(middev, 0x00000000);
middev->finish(middev);
}
+
}
}
@@
-488,7
+501,7
@@
static gfxdocument_t*pdf_open(gfxsource_t*src, const char*filename)
i->pages[t-1].yMax = i->info->y2;
i->pages[t-1].width = i->info->x2 - i->info->x1;
i->pages[t-1].height = i->info->y2 - i->info->y1;
i->pages[t-1].yMax = i->info->y2;
i->pages[t-1].width = i->info->x2 - i->info->x1;
i->pages[t-1].height = i->info->y2 - i->info->y1;
- i->pages[t-1].number_of_images = i->info->num_images;
+ i->pages[t-1].number_of_images = i->info->num_ppm_images + i->info->num_jpeg_images;
i->pages[t-1].number_of_links = i->info->num_links;
i->pages[t-1].number_of_fonts = i->info->num_fonts;
i->pages[t-1].has_info = 1;
i->pages[t-1].number_of_links = i->info->num_links;
i->pages[t-1].number_of_fonts = i->info->num_fonts;
i->pages[t-1].has_info = 1;