summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source/pdf/pdf-clean-file.c8
-rw-r--r--source/tools/pdfinfo.c50
-rw-r--r--source/tools/pdfpages.c19
3 files changed, 30 insertions, 47 deletions
diff --git a/source/pdf/pdf-clean-file.c b/source/pdf/pdf-clean-file.c
index 94433eb2..0464e8cc 100644
--- a/source/pdf/pdf-clean-file.c
+++ b/source/pdf/pdf-clean-file.c
@@ -28,11 +28,10 @@ string_in_names_list(fz_context *ctx, pdf_obj *p, pdf_obj *names_list)
static void retainpage(fz_context *ctx, pdf_document *doc, pdf_obj *parent, pdf_obj *kids, int page)
{
pdf_obj *pageref = pdf_lookup_page_obj(ctx, doc, page-1);
- pdf_obj *pageobj = pdf_resolve_indirect(ctx, pageref);
- pdf_flatten_inheritable_page_items(ctx, doc, pageobj);
+ pdf_flatten_inheritable_page_items(ctx, doc, pageref);
- pdf_dict_put(ctx, pageobj, PDF_NAME_Parent, parent);
+ pdf_dict_put(ctx, pageref, PDF_NAME_Parent, parent);
/* Store page object in new kids array */
pdf_array_push(ctx, kids, pageref);
@@ -283,9 +282,8 @@ static void retainpages(fz_context *ctx, globals *glo, int argc, char **argv)
for (i = 0; i < pagecount; i++)
{
pdf_obj *pageref = pdf_lookup_page_obj(ctx, doc, i);
- pdf_obj *pageobj = pdf_resolve_indirect(ctx, pageref);
- pdf_obj *annots = pdf_dict_get(ctx, pageobj, PDF_NAME_Annots);
+ pdf_obj *annots = pdf_dict_get(ctx, pageref, PDF_NAME_Annots);
int len = pdf_array_len(ctx, annots);
int j;
diff --git a/source/tools/pdfinfo.c b/source/tools/pdfinfo.c
index 193b727f..7d058b14 100644
--- a/source/tools/pdfinfo.c
+++ b/source/tools/pdfinfo.c
@@ -20,7 +20,6 @@ struct info
{
int page;
pdf_obj *pageref;
- pdf_obj *pageobj;
union {
struct {
pdf_obj *obj;
@@ -199,19 +198,19 @@ showglobalinfo(fz_context *ctx, globals *glo)
}
static void
-gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj)
+gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref)
{
fz_rect bbox;
pdf_obj *obj;
int j;
- obj = pdf_dict_get(ctx, pageobj, PDF_NAME_MediaBox);
+ obj = pdf_dict_get(ctx, pageref, PDF_NAME_MediaBox);
if (!pdf_is_array(ctx, obj))
return;
pdf_to_rect(ctx, obj, &bbox);
- obj = pdf_dict_get(ctx, pageobj, PDF_NAME_UserUnit);
+ obj = pdf_dict_get(ctx, pageref, PDF_NAME_UserUnit);
if (pdf_is_real(ctx, obj))
{
float unit = pdf_to_real(ctx, obj);
@@ -233,7 +232,6 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_
glo->dim[glo->dims - 1].page = page;
glo->dim[glo->dims - 1].pageref = pageref;
- glo->dim[glo->dims - 1].pageobj = pageobj;
glo->dim[glo->dims - 1].u.dim.bbox = fz_malloc(ctx, sizeof(fz_rect));
memcpy(glo->dim[glo->dims - 1].u.dim.bbox, &bbox, sizeof (fz_rect));
@@ -241,7 +239,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_
}
static void
-gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj, pdf_obj *dict)
+gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *dict)
{
int i, n;
@@ -282,7 +280,6 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
glo->font[glo->fonts - 1].page = page;
glo->font[glo->fonts - 1].pageref = pageref;
- glo->font[glo->fonts - 1].pageobj = pageobj;
glo->font[glo->fonts - 1].u.font.obj = fontdict;
glo->font[glo->fonts - 1].u.font.subtype = subtype;
glo->font[glo->fonts - 1].u.font.name = basefont ? basefont : name;
@@ -291,7 +288,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
}
static void
-gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj, pdf_obj *dict)
+gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *dict)
{
int i, n;
@@ -352,7 +349,6 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
glo->image[glo->images - 1].page = page;
glo->image[glo->images - 1].pageref = pageref;
- glo->image[glo->images - 1].pageobj = pageobj;
glo->image[glo->images - 1].u.image.obj = imagedict;
glo->image[glo->images - 1].u.image.width = width;
glo->image[glo->images - 1].u.image.height = height;
@@ -364,7 +360,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
}
static void
-gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj, pdf_obj *dict)
+gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *dict)
{
int i, n;
@@ -410,7 +406,6 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
glo->form[glo->forms - 1].page = page;
glo->form[glo->forms - 1].pageref = pageref;
- glo->form[glo->forms - 1].pageobj = pageobj;
glo->form[glo->forms - 1].u.form.obj = xobjdict;
glo->form[glo->forms - 1].u.form.groupsubtype = groupsubtype;
glo->form[glo->forms - 1].u.form.reference = reference;
@@ -418,7 +413,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
}
static void
-gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj, pdf_obj *dict)
+gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *dict)
{
int i, n;
@@ -455,13 +450,12 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
glo->psobj[glo->psobjs - 1].page = page;
glo->psobj[glo->psobjs - 1].pageref = pageref;
- glo->psobj[glo->psobjs - 1].pageobj = pageobj;
glo->psobj[glo->psobjs - 1].u.form.obj = xobjdict;
}
}
static void
-gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj, pdf_obj *dict)
+gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *dict)
{
int i, n;
@@ -498,14 +492,13 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
glo->shading[glo->shadings - 1].page = page;
glo->shading[glo->shadings - 1].pageref = pageref;
- glo->shading[glo->shadings - 1].pageobj = pageobj;
glo->shading[glo->shadings - 1].u.shading.obj = shade;
glo->shading[glo->shadings - 1].u.shading.type = type;
}
}
static void
-gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *pageobj, pdf_obj *dict)
+gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *dict)
{
int i, n;
@@ -566,7 +559,6 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
glo->pattern[glo->patterns - 1].page = page;
glo->pattern[glo->patterns - 1].pageref = pageref;
- glo->pattern[glo->patterns - 1].pageobj = pageobj;
glo->pattern[glo->patterns - 1].u.pattern.obj = patterndict;
glo->pattern[glo->patterns - 1].u.pattern.type = type;
glo->pattern[glo->patterns - 1].u.pattern.paint = paint;
@@ -578,7 +570,6 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
static void
gatherresourceinfo(fz_context *ctx, globals *glo, int page, pdf_obj *rsrc, int show)
{
- pdf_obj *pageobj;
pdf_obj *pageref;
pdf_obj *font;
pdf_obj *xobj;
@@ -588,9 +579,8 @@ gatherresourceinfo(fz_context *ctx, globals *glo, int page, pdf_obj *rsrc, int s
int i;
pageref = pdf_lookup_page_obj(ctx, glo->doc, page-1);
- pageobj = pdf_resolve_indirect(ctx, pageref);
- if (!pageobj)
+ if (!pageref)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot retrieve info from page %d", page);
font = pdf_dict_get(ctx, rsrc, PDF_NAME_Font);
@@ -598,7 +588,7 @@ gatherresourceinfo(fz_context *ctx, globals *glo, int page, pdf_obj *rsrc, int s
{
int n;
- gatherfonts(ctx, glo, page, pageref, pageobj, font);
+ gatherfonts(ctx, glo, page, pageref, font);
n = pdf_dict_len(ctx, font);
for (i = 0; i < n; i++)
{
@@ -615,9 +605,9 @@ gatherresourceinfo(fz_context *ctx, globals *glo, int page, pdf_obj *rsrc, int s
{
int n;
- gatherimages(ctx, glo, page, pageref, pageobj, xobj);
- gatherforms(ctx, glo, page, pageref, pageobj, xobj);
- gatherpsobjs(ctx, glo, page, pageref, pageobj, xobj);
+ gatherimages(ctx, glo, page, pageref, xobj);
+ gatherforms(ctx, glo, page, pageref, xobj);
+ gatherpsobjs(ctx, glo, page, pageref, xobj);
n = pdf_dict_len(ctx, xobj);
for (i = 0; i < n; i++)
{
@@ -630,13 +620,13 @@ gatherresourceinfo(fz_context *ctx, globals *glo, int page, pdf_obj *rsrc, int s
shade = pdf_dict_get(ctx, rsrc, PDF_NAME_Shading);
if (show & SHADINGS && shade)
- gathershadings(ctx, glo, page, pageref, pageobj, shade);
+ gathershadings(ctx, glo, page, pageref, shade);
pattern = pdf_dict_get(ctx, rsrc, PDF_NAME_Pattern);
if (show & PATTERNS && pattern)
{
int n;
- gatherpatterns(ctx, glo, page, pageref, pageobj, pattern);
+ gatherpatterns(ctx, glo, page, pageref, pattern);
n = pdf_dict_len(ctx, pattern);
for (i = 0; i < n; i++)
{
@@ -651,19 +641,17 @@ gatherresourceinfo(fz_context *ctx, globals *glo, int page, pdf_obj *rsrc, int s
static void
gatherpageinfo(fz_context *ctx, globals *glo, int page, int show)
{
- pdf_obj *pageobj;
pdf_obj *pageref;
pdf_obj *rsrc;
pageref = pdf_lookup_page_obj(ctx, glo->doc, page-1);
- pageobj = pdf_resolve_indirect(ctx, pageref);
- if (!pageobj)
+ if (!pageref)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot retrieve info from page %d", page);
- gatherdimensions(ctx, glo, page, pageref, pageobj);
+ gatherdimensions(ctx, glo, page, pageref);
- rsrc = pdf_dict_get(ctx, pageobj, PDF_NAME_Resources);
+ rsrc = pdf_dict_get(ctx, pageref, PDF_NAME_Resources);
gatherresourceinfo(ctx, glo, page, rsrc, show);
}
diff --git a/source/tools/pdfpages.c b/source/tools/pdfpages.c
index 62aa4eeb..cb6a6a2d 100644
--- a/source/tools/pdfpages.c
+++ b/source/tools/pdfpages.c
@@ -66,7 +66,6 @@ shownum(fz_context *ctx, fz_output *out, pdf_obj *page, char *text, pdf_obj *nam
static int
showpage(fz_context *ctx, pdf_document *doc, fz_output *out, int page)
{
- pdf_obj *pageobj;
pdf_obj *pageref;
int failed = 0;
@@ -74,9 +73,7 @@ showpage(fz_context *ctx, pdf_document *doc, fz_output *out, int page)
fz_try(ctx)
{
pageref = pdf_lookup_page_obj(ctx, doc, page-1);
- pageobj = pdf_resolve_indirect(ctx, pageref);
-
- if (!pageobj)
+ if (!pageref)
fz_throw(ctx, FZ_ERROR_GENERIC, "cannot retrieve info from page %d", page);
}
fz_catch(ctx)
@@ -87,13 +84,13 @@ showpage(fz_context *ctx, pdf_document *doc, fz_output *out, int page)
if (!failed)
{
- failed |= showbox(ctx, out, pageobj, "MediaBox", PDF_NAME_MediaBox);
- failed |= showbox(ctx, out, pageobj, "CropBox", PDF_NAME_CropBox);
- failed |= showbox(ctx, out, pageobj, "ArtBox", PDF_NAME_ArtBox);
- failed |= showbox(ctx, out, pageobj, "BleedBox", PDF_NAME_BleedBox);
- failed |= showbox(ctx, out, pageobj, "TrimBox", PDF_NAME_TrimBox);
- failed |= shownum(ctx, out, pageobj, "Rotate", PDF_NAME_Rotate);
- failed |= shownum(ctx, out, pageobj, "UserUnit", PDF_NAME_UserUnit);
+ failed |= showbox(ctx, out, pageref, "MediaBox", PDF_NAME_MediaBox);
+ failed |= showbox(ctx, out, pageref, "CropBox", PDF_NAME_CropBox);
+ failed |= showbox(ctx, out, pageref, "ArtBox", PDF_NAME_ArtBox);
+ failed |= showbox(ctx, out, pageref, "BleedBox", PDF_NAME_BleedBox);
+ failed |= showbox(ctx, out, pageref, "TrimBox", PDF_NAME_TrimBox);
+ failed |= shownum(ctx, out, pageref, "Rotate", PDF_NAME_Rotate);
+ failed |= shownum(ctx, out, pageref, "UserUnit", PDF_NAME_UserUnit);
}
fz_printf(ctx, out, "</page>\n");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:19:07 +0000