pdf: Drop generation number from public interfaces.

The generation number is only needed for decryption, and is assumed
to be zero or irrelevant for all other uses.

Store the original object number and generation in the xref slot, so
that we can decrypt them even when the objects have been renumbered,
without needing to pass the original object number around through
the stream loading APIs.

4 files changed, 44 insertions, 60 deletions

diff --git a/source/tools/murun.c b/source/tools/murun.c
index 1f2f5e5f..df0cbdc2 100644
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -2914,7 +2914,7 @@ static void ffi_PDFObject_readStream(js_State *J)
 		if (!pdf_is_stream(ctx, obj))
 			fz_throw(ctx, FZ_ERROR_GENERIC, "not a stream");
 		pdf = pdf_get_indirect_document(ctx, obj);
-		buf = pdf_load_stream(ctx, pdf, pdf_to_num(ctx, obj), pdf_to_gen(ctx, obj));
+		buf = pdf_load_stream(ctx, pdf, pdf_to_num(ctx, obj));
 	} fz_catch(ctx)
 		rethrow(J);
 	ffi_pushbuffer(J, buf);
@@ -2971,7 +2971,7 @@ static void ffi_PDFObject_readRawStream(js_State *J)
 		if (!pdf_is_stream(ctx, obj))
 			fz_throw(ctx, FZ_ERROR_GENERIC, "not a stream");
 		pdf = pdf_get_indirect_document(ctx, obj);
-		buf = pdf_load_raw_stream(ctx, pdf, pdf_to_num(ctx, obj), pdf_to_gen(ctx, obj));
+		buf = pdf_load_raw_stream(ctx, pdf, pdf_to_num(ctx, obj));
 	} fz_catch(ctx)
 		rethrow(J);
 	ffi_pushbuffer(J, buf);
diff --git a/source/tools/pdfextract.c b/source/tools/pdfextract.c
index 2a3689c5..79bdf37a 100644
--- a/source/tools/pdfextract.c
+++ b/source/tools/pdfextract.c
@@ -137,7 +137,7 @@ static void savefont(pdf_obj *dict, int num)
 		return;
 	}
 
-	buf = pdf_load_stream(ctx, doc, pdf_to_num(ctx, stream), pdf_to_gen(ctx, stream));
+	buf = pdf_load_stream(ctx, doc, pdf_to_num(ctx, stream));
 	len = fz_buffer_storage(ctx, buf, &data);
 	fz_try(ctx)
 	{
@@ -166,7 +166,7 @@ static void showobject(int num)
 
 	fz_try(ctx)
 	{
-		obj = pdf_load_object(ctx, doc, num, 0);
+		obj = pdf_load_object(ctx, doc, num);
 
 		if (isimage(obj))
 			saveimage(num);
diff --git a/source/tools/pdfinfo.c b/source/tools/pdfinfo.c
index 9331a8bf..193b727f 100644
--- a/source/tools/pdfinfo.c
+++ b/source/tools/pdfinfo.c
@@ -184,14 +184,14 @@ showglobalinfo(fz_context *ctx, globals *glo)
 	obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Info);
 	if (obj)
 	{
-		fz_printf(ctx, out, "Info object (%d %d R):\n", pdf_to_num(ctx, obj), pdf_to_gen(ctx, obj));
+		fz_printf(ctx, out, "Info object (%d 0 R):\n", pdf_to_num(ctx, obj));
 		pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1);
 	}
 
 	obj = pdf_dict_get(ctx, pdf_trailer(ctx, doc), PDF_NAME_Encrypt);
 	if (obj)
 	{
-		fz_printf(ctx, out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx, obj), pdf_to_gen(ctx, obj));
+		fz_printf(ctx, out, "\nEncryption object (%d 0 R):\n", pdf_to_num(ctx, obj));
 		pdf_print_obj(ctx, out, pdf_resolve_indirect(ctx, obj), 1);
 	}
 
@@ -258,7 +258,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
 		fontdict = pdf_dict_get_val(ctx, dict, i);
 		if (!pdf_is_dict(ctx, fontdict))
 		{
-			fz_warn(ctx, "not a font dict (%d %d R)", pdf_to_num(ctx, fontdict), pdf_to_gen(ctx, fontdict));
+			fz_warn(ctx, "not a font dict (%d 0 R)", pdf_to_num(ctx, fontdict));
 			continue;
 		}
 
@@ -311,7 +311,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
 		imagedict = pdf_dict_get_val(ctx, dict, i);
 		if (!pdf_is_dict(ctx, imagedict))
 		{
-			fz_warn(ctx, "not an image dict (%d %d R)", pdf_to_num(ctx, imagedict), pdf_to_gen(ctx, imagedict));
+			fz_warn(ctx, "not an image dict (%d 0 R)", pdf_to_num(ctx, imagedict));
 			continue;
 		}
 
@@ -382,7 +382,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj *
 		xobjdict = pdf_dict_get_val(ctx, dict, i);
 		if (!pdf_is_dict(ctx, xobjdict))
 		{
-			fz_warn(ctx, "not a xobject dict (%d %d R)", pdf_to_num(ctx, xobjdict), pdf_to_gen(ctx, xobjdict));
+			fz_warn(ctx, "not a xobject dict (%d 0 R)", pdf_to_num(ctx, xobjdict));
 			continue;
 		}
 
@@ -433,7 +433,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj
 		xobjdict = pdf_dict_get_val(ctx, dict, i);
 		if (!pdf_is_dict(ctx, xobjdict))
 		{
-			fz_warn(ctx, "not a xobject dict (%d %d R)", pdf_to_num(ctx, xobjdict), pdf_to_gen(ctx, xobjdict));
+			fz_warn(ctx, "not a xobject dict (%d 0 R)", pdf_to_num(ctx, xobjdict));
 			continue;
 		}
 
@@ -475,14 +475,14 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
 		shade = pdf_dict_get_val(ctx, dict, i);
 		if (!pdf_is_dict(ctx, shade))
 		{
-			fz_warn(ctx, "not a shading dict (%d %d R)", pdf_to_num(ctx, shade), pdf_to_gen(ctx, shade));
+			fz_warn(ctx, "not a shading dict (%d 0 R)", pdf_to_num(ctx, shade));
 			continue;
 		}
 
 		type = pdf_dict_get(ctx, shade, PDF_NAME_ShadingType);
 		if (!pdf_is_int(ctx, type) || pdf_to_int(ctx, type) < 1 || pdf_to_int(ctx, type) > 7)
 		{
-			fz_warn(ctx, "not a shading type (%d %d R)", pdf_to_num(ctx, shade), pdf_to_gen(ctx, shade));
+			fz_warn(ctx, "not a shading type (%d 0 R)", pdf_to_num(ctx, shade));
 			type = NULL;
 		}
 
@@ -522,14 +522,14 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
 		patterndict = pdf_dict_get_val(ctx, dict, i);
 		if (!pdf_is_dict(ctx, patterndict))
 		{
-			fz_warn(ctx, "not a pattern dict (%d %d R)", pdf_to_num(ctx, patterndict), pdf_to_gen(ctx, patterndict));
+			fz_warn(ctx, "not a pattern dict (%d 0 R)", pdf_to_num(ctx, patterndict));
 			continue;
 		}
 
 		type = pdf_dict_get(ctx, patterndict, PDF_NAME_PatternType);
 		if (!pdf_is_int(ctx, type) || pdf_to_int(ctx, type) < 1 || pdf_to_int(ctx, type) > 2)
 		{
-			fz_warn(ctx, "not a pattern type (%d %d R)", pdf_to_num(ctx, patterndict), pdf_to_gen(ctx, patterndict));
+			fz_warn(ctx, "not a pattern type (%d 0 R)", pdf_to_num(ctx, patterndict));
 			type = NULL;
 		}
 
@@ -538,14 +538,14 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob
 			paint = pdf_dict_get(ctx, patterndict, PDF_NAME_PaintType);
 			if (!pdf_is_int(ctx, paint) || pdf_to_int(ctx, paint) < 1 || pdf_to_int(ctx, paint) > 2)
 			{
-				fz_warn(ctx, "not a pattern paint type (%d %d R)", pdf_to_num(ctx, patterndict), pdf_to_gen(ctx, patterndict));
+				fz_warn(ctx, "not a pattern paint type (%d 0 R)", pdf_to_num(ctx, patterndict));
 				paint = NULL;
 			}
 
 			tiling = pdf_dict_get(ctx, patterndict, PDF_NAME_TilingType);
 			if (!pdf_is_int(ctx, tiling) || pdf_to_int(ctx, tiling) < 1 || pdf_to_int(ctx, tiling) > 3)
 			{
-				fz_warn(ctx, "not a pattern tiling type (%d %d R)", pdf_to_num(ctx, patterndict), pdf_to_gen(ctx, patterndict));
+				fz_warn(ctx, "not a pattern tiling type (%d 0 R)", pdf_to_num(ctx, patterndict));
 				tiling = NULL;
 			}
 		}
@@ -674,7 +674,7 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 	int j;
 	fz_output *out = glo->out;
 
-#define PAGE_FMT_zu "\t%d\t(%d %d R):\t"
+#define PAGE_FMT_zu "\t%d\t(%d 0 R):\t"
 
 	if (show & DIMENSIONS && glo->dims > 0)
 	{
@@ -684,7 +684,6 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 			fz_printf(ctx, out, PAGE_FMT_zu "[ %g %g %g %g ]\n",
 				glo->dim[i].page,
 				pdf_to_num(ctx, glo->dim[i].pageref),
-				pdf_to_gen(ctx, glo->dim[i].pageref),
 				glo->dim[i].u.dim.bbox->x0,
 				glo->dim[i].u.dim.bbox->y0,
 				glo->dim[i].u.dim.bbox->x1,
@@ -698,16 +697,14 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 		fz_printf(ctx, out, "Fonts (%d):\n", glo->fonts);
 		for (i = 0; i < glo->fonts; i++)
 		{
-			fz_printf(ctx, out, PAGE_FMT_zu "%s '%s' %s%s(%d %d R)\n",
+			fz_printf(ctx, out, PAGE_FMT_zu "%s '%s' %s%s(%d 0 R)\n",
 				glo->font[i].page,
 				pdf_to_num(ctx, glo->font[i].pageref),
-				pdf_to_gen(ctx, glo->font[i].pageref),
 				pdf_to_name(ctx, glo->font[i].u.font.subtype),
 				pdf_to_name(ctx, glo->font[i].u.font.name),
 				glo->font[i].u.font.encoding ? pdf_to_name(ctx, glo->font[i].u.font.encoding) : "",
 				glo->font[i].u.font.encoding ? " " : "",
-				pdf_to_num(ctx, glo->font[i].u.font.obj),
-				pdf_to_gen(ctx, glo->font[i].u.font.obj));
+				pdf_to_num(ctx, glo->font[i].u.font.obj));
 		}
 		fz_printf(ctx, out, "\n");
 	}
@@ -722,8 +719,7 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 
 			fz_printf(ctx, out, PAGE_FMT_zu "[ ",
 				glo->image[i].page,
-				pdf_to_num(ctx, glo->image[i].pageref),
-				pdf_to_gen(ctx, glo->image[i].pageref));
+				pdf_to_num(ctx, glo->image[i].pageref));
 
 			if (pdf_is_array(ctx, glo->image[i].u.image.filter))
 			{
@@ -795,15 +791,14 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 					fz_strlcpy(altcs, "Sep", 4);
 			}
 
-			fz_printf(ctx, out, " ] %dx%d %dbpc %s%s%s (%d %d R)\n",
+			fz_printf(ctx, out, " ] %dx%d %dbpc %s%s%s (%d 0 R)\n",
 				pdf_to_int(ctx, glo->image[i].u.image.width),
 				pdf_to_int(ctx, glo->image[i].u.image.height),
 				glo->image[i].u.image.bpc ? pdf_to_int(ctx, glo->image[i].u.image.bpc) : 1,
 				glo->image[i].u.image.cs ? cs : "ImageMask",
 				glo->image[i].u.image.altcs ? " " : "",
 				glo->image[i].u.image.altcs ? altcs : "",
-				pdf_to_num(ctx, glo->image[i].u.image.obj),
-				pdf_to_gen(ctx, glo->image[i].u.image.obj));
+				pdf_to_num(ctx, glo->image[i].u.image.obj));
 
 			fz_free(ctx, cs);
 			fz_free(ctx, altcs);
@@ -828,13 +823,11 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 				"Tensor patch",
 			};
 
-			fz_printf(ctx, out, PAGE_FMT_zu "%s (%d %d R)\n",
+			fz_printf(ctx, out, PAGE_FMT_zu "%s (%d 0 R)\n",
 				glo->shading[i].page,
 				pdf_to_num(ctx, glo->shading[i].pageref),
-				pdf_to_gen(ctx, glo->shading[i].pageref),
 				shadingtype[pdf_to_int(ctx, glo->shading[i].u.shading.type)],
-				pdf_to_num(ctx, glo->shading[i].u.shading.obj),
-				pdf_to_gen(ctx, glo->shading[i].u.shading.obj));
+				pdf_to_num(ctx, glo->shading[i].u.shading.obj));
 		}
 		fz_printf(ctx, out, "\n");
 	}
@@ -860,25 +853,20 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 					"Constant/fast tiling",
 				};
 
-				fz_printf(ctx, out, PAGE_FMT_zu "Tiling %s %s (%d %d R)\n",
+				fz_printf(ctx, out, PAGE_FMT_zu "Tiling %s %s (%d 0 R)\n",
 						glo->pattern[i].page,
 						pdf_to_num(ctx, glo->pattern[i].pageref),
-						pdf_to_gen(ctx, glo->pattern[i].pageref),
 						painttype[pdf_to_int(ctx, glo->pattern[i].u.pattern.paint)],
 						tilingtype[pdf_to_int(ctx, glo->pattern[i].u.pattern.tiling)],
-						pdf_to_num(ctx, glo->pattern[i].u.pattern.obj),
-						pdf_to_gen(ctx, glo->pattern[i].u.pattern.obj));
+						pdf_to_num(ctx, glo->pattern[i].u.pattern.obj));
 			}
 			else
 			{
-				fz_printf(ctx, out, PAGE_FMT_zu "Shading %d %d R (%d %d R)\n",
+				fz_printf(ctx, out, PAGE_FMT_zu "Shading %d 0 R (%d 0 R)\n",
 						glo->pattern[i].page,
 						pdf_to_num(ctx, glo->pattern[i].pageref),
-						pdf_to_gen(ctx, glo->pattern[i].pageref),
 						pdf_to_num(ctx, glo->pattern[i].u.pattern.shading),
-						pdf_to_gen(ctx, glo->pattern[i].u.pattern.shading),
-						pdf_to_num(ctx, glo->pattern[i].u.pattern.obj),
-						pdf_to_gen(ctx, glo->pattern[i].u.pattern.obj));
+						pdf_to_num(ctx, glo->pattern[i].u.pattern.obj));
 			}
 		}
 		fz_printf(ctx, out, "\n");
@@ -889,16 +877,14 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 		fz_printf(ctx, out, "Form xobjects (%d):\n", glo->forms);
 		for (i = 0; i < glo->forms; i++)
 		{
-			fz_printf(ctx, out, PAGE_FMT_zu "Form%s%s%s%s (%d %d R)\n",
+			fz_printf(ctx, out, PAGE_FMT_zu "Form%s%s%s%s (%d 0 R)\n",
 				glo->form[i].page,
 				pdf_to_num(ctx, glo->form[i].pageref),
-				pdf_to_gen(ctx, glo->form[i].pageref),
 				glo->form[i].u.form.groupsubtype ? " " : "",
 				glo->form[i].u.form.groupsubtype ? pdf_to_name(ctx, glo->form[i].u.form.groupsubtype) : "",
 				glo->form[i].u.form.groupsubtype ? " Group" : "",
 				glo->form[i].u.form.reference ? " Reference" : "",
-				pdf_to_num(ctx, glo->form[i].u.form.obj),
-				pdf_to_gen(ctx, glo->form[i].u.form.obj));
+				pdf_to_num(ctx, glo->form[i].u.form.obj));
 		}
 		fz_printf(ctx, out, "\n");
 	}
@@ -908,12 +894,10 @@ printinfo(fz_context *ctx, globals *glo, char *filename, int show, int page)
 		fz_printf(ctx, out, "Postscript xobjects (%d):\n", glo->psobjs);
 		for (i = 0; i < glo->psobjs; i++)
 		{
-			fz_printf(ctx, out, PAGE_FMT_zu "(%d %d R)\n",
+			fz_printf(ctx, out, PAGE_FMT_zu "(%d 0 R)\n",
 				glo->psobj[i].page,
 				pdf_to_num(ctx, glo->psobj[i].pageref),
-				pdf_to_gen(ctx, glo->psobj[i].pageref),
-				pdf_to_num(ctx, glo->psobj[i].u.form.obj),
-				pdf_to_gen(ctx, glo->psobj[i].u.form.obj));
+				pdf_to_num(ctx, glo->psobj[i].u.form.obj));
 		}
 		fz_printf(ctx, out, "\n");
 	}
diff --git a/source/tools/pdfshow.c b/source/tools/pdfshow.c
index d56cbcd6..3ff479a5 100644
--- a/source/tools/pdfshow.c
+++ b/source/tools/pdfshow.c
@@ -65,7 +65,7 @@ static void showpagetree(void)
 	for (i = 0; i < count; i++)
 	{
 		ref = pdf_lookup_page_obj(ctx, doc, i);
-		fz_printf(ctx, out, "page %d = %d %d R\n", i + 1, pdf_to_num(ctx, ref), pdf_to_gen(ctx, ref));
+		fz_printf(ctx, out, "page %d = %d 0 R\n", i + 1, pdf_to_num(ctx, ref));
 	}
 	fz_printf(ctx, out, "\n");
 }
@@ -93,7 +93,7 @@ static void showsafe(unsigned char *buf, size_t n)
 	}
 }
 
-static void showstream(int num, int gen)
+static void showstream(int num)
 {
 	fz_stream *stm;
 	unsigned char buf[2048];
@@ -102,9 +102,9 @@ static void showstream(int num, int gen)
 	showcolumn = 0;
 
 	if (showdecode)
-		stm = pdf_open_stream(ctx, doc, num, gen);
+		stm = pdf_open_stream(ctx, doc, num);
 	else
-		stm = pdf_open_raw_stream(ctx, doc, num, gen);
+		stm = pdf_open_raw_stream(ctx, doc, num);
 
 	while (1)
 	{
@@ -120,34 +120,34 @@ static void showstream(int num, int gen)
 	fz_drop_stream(ctx, stm);
 }
 
-static void showobject(int num, int gen)
+static void showobject(int num)
 {
 	pdf_obj *obj;
 
 	if (!doc)
 		fz_throw(ctx, FZ_ERROR_GENERIC, "no file specified");
 
-	obj = pdf_load_object(ctx, doc, num, gen);
+	obj = pdf_load_object(ctx, doc, num);
 
 	if (pdf_is_stream(ctx, obj))
 	{
 		if (showbinary)
 		{
-			showstream(num, gen);
+			showstream(num);
 		}
 		else
 		{
-			fz_printf(ctx, out, "%d %d obj\n", num, gen);
+			fz_printf(ctx, out, "%d 0 obj\n", num);
 			pdf_print_obj(ctx, out, obj, 0);
 			fz_printf(ctx, out, "\nstream\n");
-			showstream(num, gen);
+			showstream(num);
 			fz_printf(ctx, out, "endstream\n");
 			fz_printf(ctx, out, "endobj\n\n");
 		}
 	}
 	else
 	{
-		fz_printf(ctx, out, "%d %d obj\n", num, gen);
+		fz_printf(ctx, out, "%d 0 obj\n", num);
 		pdf_print_obj(ctx, out, obj, 0);
 		fz_printf(ctx, out, "\nendobj\n\n");
 	}
@@ -168,7 +168,7 @@ static void showgrep(char *filename)
 		{
 			fz_try(ctx)
 			{
-				obj = pdf_load_object(ctx, doc, i, 0);
+				obj = pdf_load_object(ctx, doc, i);
 			}
 			fz_catch(ctx)
 			{
@@ -268,7 +268,7 @@ int pdfshow_main(int argc, char **argv)
 			case 'p': showpagetree(); break;
 			case 'g': showgrep(filename); break;
 			case 'o': showoutline(); break;
-			default: showobject(atoi(argv[fz_optind]), 0); break;
+			default: showobject(atoi(argv[fz_optind])); break;
 			}
 			fz_optind++;
 		}