diff options
| author | Sebastian Rasmussen <sebras@hotmail.com> | 2009-07-05 21:06:19 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@hotmail.com> | 2009-07-05 21:06:19 +0200 |
| commit | a84b2a34e5f7a0d7579f402be66a2a32269668a5 (patch) | |
| tree | 199c5404a21128c153d7c810a08b8d4d656633dc /apps | |
| parent | 4ebd84900f7f5d0afda14e09c518e614d9fde60d (diff) | |
| download | mupdf-a84b2a34e5f7a0d7579f402be66a2a32269668a5.tar.xz | |
Fix bugs in pdfinfo where not all objects were properly tracked.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/pdfinfo.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c index 3a0c86e6..9d5d2de4 100644 --- a/apps/pdfinfo.c +++ b/apps/pdfinfo.c @@ -287,7 +287,7 @@ gatherfonts(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) break; if (k < fonts) - return fz_okay; + continue; fonts++; @@ -438,13 +438,13 @@ gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) if (!fz_isname(type)) return fz_throw("not a xobject type (%d %d R)", fz_tonum(ref), fz_togen(ref)); if (strcmp(fz_toname(type), "Form")) - return fz_okay; + continue; subtype = fz_dictgets(xobjdict, "Subtype2"); if (subtype && !fz_isname(subtype)) return fz_throw("not a xobject subtype (%d %d R)", fz_tonum(ref), fz_togen(ref)); if (strcmp(fz_toname(subtype), "PS")) - return fz_okay; + continue; group = fz_dictgets(xobjdict, "Group"); if (group && !fz_isdict(group)) @@ -460,7 +460,7 @@ gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) break; if (k < forms) - return fz_okay; + continue; forms++; @@ -503,14 +503,14 @@ gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) if (!fz_isname(type)) return fz_throw("not a xobject type (%d %d R)", fz_tonum(ref), fz_togen(ref)); if (strcmp(fz_toname(type), "Form")) - return fz_okay; + continue; subtype = fz_dictgets(xobjdict, "Subtype2"); if (subtype && !fz_isname(subtype)) return fz_throw("not a xobject subtype (%d %d R)", fz_tonum(ref), fz_togen(ref)); if (strcmp(fz_toname(type), "PS") && (strcmp(fz_toname(type), "Form") || strcmp(fz_toname(subtype), "PS"))) - return fz_okay; + continue; for (k = 0; k < psobjs; k++) if (fz_tonum(psobj[k]->ref) == fz_tonum(ref) && @@ -518,7 +518,7 @@ gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) break; if (k < psobjs) - return fz_okay; + continue; psobjs++; @@ -564,7 +564,7 @@ gathershadings(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) break; if (k < shadings) - return fz_okay; + continue; shadings++; @@ -624,7 +624,7 @@ gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict) break; if (k < patterns) - return fz_okay; + continue; patterns++; |