Change order of arguments to pdf_add_page etc.

Resources are defined before they are used; so it's only logical to
have the resource dictionary before the content buffer in the argument
list.

6 files changed, 12 insertions, 12 deletions

diff --git a/source/pdf/pdf-appearance.c b/source/pdf/pdf-appearance.c
index 45d81c63..122f36ac 100644
--- a/source/pdf/pdf-appearance.c
+++ b/source/pdf/pdf-appearance.c
@@ -1617,7 +1617,7 @@ void pdf_set_annot_appearance(fz_context *ctx, pdf_document *doc, pdf_annot *ann
 
 		contents = fz_new_buffer(ctx, 0);
 
-		dev = pdf_new_pdf_device(ctx, doc, &fz_identity, &trect, contents, resources);
+		dev = pdf_new_pdf_device(ctx, doc, &fz_identity, &trect, resources, contents);
 		fz_run_display_list(ctx, disp_list, dev, &ctm, &fz_infinite_rect, NULL);
 		fz_drop_device(ctx, dev);
 
diff --git a/source/pdf/pdf-device.c b/source/pdf/pdf-device.c
index 6831f788..9c38dd41 100644
--- a/source/pdf/pdf-device.c
+++ b/source/pdf/pdf-device.c
@@ -1062,7 +1062,7 @@ pdf_dev_drop_imp(fz_context *ctx, fz_device *dev)
 	fz_free(ctx, pdev->gstates);
 }
 
-fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, const fz_matrix *topctm, const fz_rect *mediabox, fz_buffer *buf, pdf_obj *resources)
+fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, const fz_matrix *topctm, const fz_rect *mediabox, pdf_obj *resources, fz_buffer *buf)
 {
 	pdf_device *dev = fz_new_device(ctx, sizeof *dev);
 
@@ -1130,10 +1130,10 @@ fz_device *pdf_new_pdf_device(fz_context *ctx, pdf_document *doc, const fz_matri
 }
 
 fz_device *pdf_page_write(fz_context *ctx, pdf_document *doc,
-	const fz_rect *mediabox, fz_buffer **pcontents, pdf_obj **presources)
+	const fz_rect *mediabox, pdf_obj **presources, fz_buffer **pcontents)
 {
 	fz_matrix pagectm = { 1, 0, 0, -1, -mediabox->x0, mediabox->y1 };
 	*presources = pdf_new_dict(ctx, doc, 0);
 	*pcontents = fz_new_buffer(ctx, 0);
-	return pdf_new_pdf_device(ctx, doc, &pagectm, mediabox, *pcontents, *presources);
+	return pdf_new_pdf_device(ctx, doc, &pagectm, mediabox, *presources, *pcontents);
 }
diff --git a/source/pdf/pdf-page.c b/source/pdf/pdf-page.c
index de8ffe2f..45482c6e 100644
--- a/source/pdf/pdf-page.c
+++ b/source/pdf/pdf-page.c
@@ -628,7 +628,7 @@ pdf_delete_page_range(fz_context *ctx, pdf_document *doc, int start, int end)
 }
 
 pdf_obj *
-pdf_add_page(fz_context *ctx, pdf_document *doc, const fz_rect *mediabox, int rotate, fz_buffer *contents, pdf_obj *resources)
+pdf_add_page(fz_context *ctx, pdf_document *doc, const fz_rect *mediabox, int rotate, pdf_obj *resources, fz_buffer *contents)
 {
 	pdf_obj *page_obj = pdf_new_dict(ctx, doc, 5);
 	fz_try(ctx)
@@ -636,8 +636,8 @@ pdf_add_page(fz_context *ctx, pdf_document *doc, const fz_rect *mediabox, int ro
 		pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Type, PDF_NAME_Page);
 		pdf_dict_put_drop(ctx, page_obj, PDF_NAME_MediaBox, pdf_new_rect(ctx, doc, mediabox));
 		pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Rotate, pdf_new_int(ctx, doc, rotate));
-		pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Contents, pdf_add_stream(ctx, doc, contents));
 		pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Resources, pdf_add_object(ctx, doc, resources));
+		pdf_dict_put_drop(ctx, page_obj, PDF_NAME_Contents, pdf_add_stream(ctx, doc, contents));
 	}
 	fz_catch(ctx)
 	{
diff --git a/source/tools/mudraw.c b/source/tools/mudraw.c
index 9e45a4b1..1effc070 100644
--- a/source/tools/mudraw.c
+++ b/source/tools/mudraw.c
@@ -641,7 +641,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum)
 		fz_buffer *contents;
 		pdf_obj *resources;
 
-		dev = pdf_page_write(ctx, pdfout, &mediabox, &contents, &resources);
+		dev = pdf_page_write(ctx, pdfout, &mediabox, &resources, &contents);
 		fz_try(ctx)
 		{
 			pdf_obj *page_obj;
@@ -651,7 +651,7 @@ static void drawpage(fz_context *ctx, fz_document *doc, int pagenum)
 			else
 				fz_run_page(ctx, page, dev, &fz_identity, &cookie);
 
-			page_obj = pdf_add_page(ctx, pdfout, &mediabox, rotation, contents, resources);
+			page_obj = pdf_add_page(ctx, pdfout, &mediabox, rotation, resources, contents);
 			pdf_insert_page(ctx, pdfout, -1, page_obj);
 			pdf_drop_obj(ctx, page_obj);
 		}
diff --git a/source/tools/murun.c b/source/tools/murun.c
index 2f3d7e64..8825d5af 100644
--- a/source/tools/murun.c
+++ b/source/tools/murun.c
@@ -2388,12 +2388,12 @@ static void ffi_PDFDocument_addPage(js_State *J)
 	pdf_document *pdf = js_touserdata(J, 0, "pdf_document");
 	fz_rect mediabox = ffi_torect(J, 1);
 	int rotate = js_tonumber(J, 2);
-	fz_buffer *contents = ffi_tobuffer(J, 3); /* FIXME: leak if ffi_toobj throws */
-	pdf_obj *resources = ffi_toobj(J, pdf, 4);
+	pdf_obj *resources = ffi_toobj(J, pdf, 3); /* FIXME: leak if ffi_tobuffer throws */
+	fz_buffer *contents = ffi_tobuffer(J, 4);
 	pdf_obj *ind;
 
 	fz_try(ctx)
-		ind = pdf_add_page(ctx, pdf, &mediabox, rotate, contents, resources);
+		ind = pdf_add_page(ctx, pdf, &mediabox, rotate, resources, contents);
 	fz_always(ctx) {
 		fz_drop_buffer(ctx, contents);
 		pdf_drop_obj(ctx, resources);
diff --git a/source/tools/pdfcreate.c b/source/tools/pdfcreate.c
index c2a330c2..6f116c6a 100644
--- a/source/tools/pdfcreate.c
+++ b/source/tools/pdfcreate.c
@@ -133,7 +133,7 @@ static void create_page(char *input)
 	}
 	fz_drop_stream(ctx, stm);
 
-	page = pdf_add_page(ctx, doc, &mediabox, rotate, contents, resources);
+	page = pdf_add_page(ctx, doc, &mediabox, rotate, resources, contents);
 	pdf_insert_page(ctx, doc, -1, page);
 	pdf_drop_obj(ctx, page);