Move fz_obj to be pdf_obj.

Currently, we are in the slightly strange position of having
the PDF specific object types as part of fitz. Here we pull
them out into the pdf layer instead. This has been made possible
by the recent changes to make the store no longer be tied to
having fz_obj's as keys.

Most of this work is a simple huge rename; to help customers who
may have code that use such functions we have provided a sed
script to do the renaming; scripts/rename2.sed.

Various other small tweaks are required; the store used to have
some debugging code that still required knowledge of fz_obj
types - we extract that into a nicer 'type' based function
pointer. Also, the type 3 font handling used to have an fz_obj
pointer for type 3 resources, and therefore needed to know how
to free this; this has become a void * with a function to free
it.

1 files changed, 57 insertions, 57 deletions

diff --git a/pdf/pdf_nametree.c b/pdf/pdf_nametree.c
index c78e238d..98a10241 100644
--- a/pdf/pdf_nametree.c
+++ b/pdf/pdf_nametree.c
@@ -1,55 +1,55 @@
 #include "fitz.h"
 #include "mupdf.h"
 
-static fz_obj *
-pdf_lookup_name_imp(fz_context *ctx, fz_obj *node, fz_obj *needle)
+static pdf_obj *
+pdf_lookup_name_imp(fz_context *ctx, pdf_obj *node, pdf_obj *needle)
 {
-	fz_obj *kids = fz_dict_gets(node, "Kids");
-	fz_obj *names = fz_dict_gets(node, "Names");
+	pdf_obj *kids = pdf_dict_gets(node, "Kids");
+	pdf_obj *names = pdf_dict_gets(node, "Names");
 
-	if (fz_is_array(kids))
+	if (pdf_is_array(kids))
 	{
 		int l = 0;
-		int r = fz_array_len(kids) - 1;
+		int r = pdf_array_len(kids) - 1;
 
 		while (l <= r)
 		{
 			int m = (l + r) >> 1;
-			fz_obj *kid = fz_array_get(kids, m);
-			fz_obj *limits = fz_dict_gets(kid, "Limits");
-			fz_obj *first = fz_array_get(limits, 0);
-			fz_obj *last = fz_array_get(limits, 1);
+			pdf_obj *kid = pdf_array_get(kids, m);
+			pdf_obj *limits = pdf_dict_gets(kid, "Limits");
+			pdf_obj *first = pdf_array_get(limits, 0);
+			pdf_obj *last = pdf_array_get(limits, 1);
 
-			if (fz_objcmp(needle, first) < 0)
+			if (pdf_objcmp(needle, first) < 0)
 				r = m - 1;
-			else if (fz_objcmp(needle, last) > 0)
+			else if (pdf_objcmp(needle, last) > 0)
 				l = m + 1;
 			else
 			{
-				fz_obj *obj;
+				pdf_obj *obj;
 
-				if (fz_dict_mark(node))
+				if (pdf_dict_mark(node))
 					break;
 				obj = pdf_lookup_name_imp(ctx, kid, needle);
-				fz_dict_unmark(node);
+				pdf_dict_unmark(node);
 				return obj;
 			}
 		}
 	}
 
-	if (fz_is_array(names))
+	if (pdf_is_array(names))
 	{
 		int l = 0;
-		int r = (fz_array_len(names) / 2) - 1;
+		int r = (pdf_array_len(names) / 2) - 1;
 
 		while (l <= r)
 		{
 			int m = (l + r) >> 1;
 			int c;
-			fz_obj *key = fz_array_get(names, m * 2);
-			fz_obj *val = fz_array_get(names, m * 2 + 1);
+			pdf_obj *key = pdf_array_get(names, m * 2);
+			pdf_obj *val = pdf_array_get(names, m * 2 + 1);
 
-			c = fz_objcmp(needle, key);
+			c = pdf_objcmp(needle, key);
 			if (c < 0)
 				r = m - 1;
 			else if (c > 0)
@@ -61,49 +61,49 @@ pdf_lookup_name_imp(fz_context *ctx, fz_obj *node, fz_obj *needle)
 		/* Spec says names should be sorted (hence the binary search,
 		 * above), but Acrobat copes with non-sorted. Drop back to a
 		 * simple search if the binary search fails. */
-		r = fz_array_len(names)/2;
+		r = pdf_array_len(names)/2;
 		for (l = 0; l < r; l++)
-			if (!fz_objcmp(needle, fz_array_get(names, l * 2)))
-				return fz_array_get(names, l * 2 + 1);
+			if (!pdf_objcmp(needle, pdf_array_get(names, l * 2)))
+				return pdf_array_get(names, l * 2 + 1);
 	}
 
 	return NULL;
 }
 
-fz_obj *
-pdf_lookup_name(pdf_document *xref, char *which, fz_obj *needle)
+pdf_obj *
+pdf_lookup_name(pdf_document *xref, char *which, pdf_obj *needle)
 {
 	fz_context *ctx = xref->ctx;
 
-	fz_obj *root = fz_dict_gets(xref->trailer, "Root");
-	fz_obj *names = fz_dict_gets(root, "Names");
-	fz_obj *tree = fz_dict_gets(names, which);
+	pdf_obj *root = pdf_dict_gets(xref->trailer, "Root");
+	pdf_obj *names = pdf_dict_gets(root, "Names");
+	pdf_obj *tree = pdf_dict_gets(names, which);
 	return pdf_lookup_name_imp(ctx, tree, needle);
 }
 
-fz_obj *
-pdf_lookup_dest(pdf_document *xref, fz_obj *needle)
+pdf_obj *
+pdf_lookup_dest(pdf_document *xref, pdf_obj *needle)
 {
 	fz_context *ctx = xref->ctx;
 
-	fz_obj *root = fz_dict_gets(xref->trailer, "Root");
-	fz_obj *dests = fz_dict_gets(root, "Dests");
-	fz_obj *names = fz_dict_gets(root, "Names");
-	fz_obj *dest = NULL;
+	pdf_obj *root = pdf_dict_gets(xref->trailer, "Root");
+	pdf_obj *dests = pdf_dict_gets(root, "Dests");
+	pdf_obj *names = pdf_dict_gets(root, "Names");
+	pdf_obj *dest = NULL;
 
 	/* PDF 1.1 has destinations in a dictionary */
 	if (dests)
 	{
-		if (fz_is_name(needle))
-			return fz_dict_get(dests, needle);
+		if (pdf_is_name(needle))
+			return pdf_dict_get(dests, needle);
 		else
-			return fz_dict_gets(dests, fz_to_str_buf(needle));
+			return pdf_dict_gets(dests, pdf_to_str_buf(needle));
 	}
 
 	/* PDF 1.2 has destinations in a name tree */
 	if (names && !dest)
 	{
-		fz_obj *tree = fz_dict_gets(names, "Dests");
+		pdf_obj *tree = pdf_dict_gets(names, "Dests");
 		return pdf_lookup_name_imp(ctx, tree, needle);
 	}
 
@@ -111,33 +111,33 @@ pdf_lookup_dest(pdf_document *xref, fz_obj *needle)
 }
 
 static void
-pdf_load_name_tree_imp(fz_obj *dict, pdf_document *xref, fz_obj *node)
+pdf_load_name_tree_imp(pdf_obj *dict, pdf_document *xref, pdf_obj *node)
 {
 	fz_context *ctx = xref->ctx;
-	fz_obj *kids = fz_dict_gets(node, "Kids");
-	fz_obj *names = fz_dict_gets(node, "Names");
+	pdf_obj *kids = pdf_dict_gets(node, "Kids");
+	pdf_obj *names = pdf_dict_gets(node, "Names");
 	int i;
 
-	if (kids && !fz_dict_mark(node))
+	if (kids && !pdf_dict_mark(node))
 	{
-		for (i = 0; i < fz_array_len(kids); i++)
-			pdf_load_name_tree_imp(dict, xref, fz_array_get(kids, i));
-		fz_dict_unmark(node);
+		for (i = 0; i < pdf_array_len(kids); i++)
+			pdf_load_name_tree_imp(dict, xref, pdf_array_get(kids, i));
+		pdf_dict_unmark(node);
 	}
 
 	if (names)
 	{
-		for (i = 0; i + 1 < fz_array_len(names); i += 2)
+		for (i = 0; i + 1 < pdf_array_len(names); i += 2)
 		{
-			fz_obj *key = fz_array_get(names, i);
-			fz_obj *val = fz_array_get(names, i + 1);
-			if (fz_is_string(key))
+			pdf_obj *key = pdf_array_get(names, i);
+			pdf_obj *val = pdf_array_get(names, i + 1);
+			if (pdf_is_string(key))
 			{
 				key = pdf_to_utf8_name(ctx, key);
 				fz_dict_put(dict, key, val);
-				fz_drop_obj(key);
+				pdf_drop_obj(key);
 			}
-			else if (fz_is_name(key))
+			else if (pdf_is_name(key))
 			{
 				fz_dict_put(dict, key, val);
 			}
@@ -145,17 +145,17 @@ pdf_load_name_tree_imp(fz_obj *dict, pdf_document *xref, fz_obj *node)
 	}
 }
 
-fz_obj *
+pdf_obj *
 pdf_load_name_tree(pdf_document *xref, char *which)
 {
 	fz_context *ctx = xref->ctx;
 
-	fz_obj *root = fz_dict_gets(xref->trailer, "Root");
-	fz_obj *names = fz_dict_gets(root, "Names");
-	fz_obj *tree = fz_dict_gets(names, which);
-	if (fz_is_dict(tree))
+	pdf_obj *root = pdf_dict_gets(xref->trailer, "Root");
+	pdf_obj *names = pdf_dict_gets(root, "Names");
+	pdf_obj *tree = pdf_dict_gets(names, which);
+	if (pdf_is_dict(tree))
 	{
-		fz_obj *dict = fz_new_dict(ctx, 100);
+		pdf_obj *dict = pdf_new_dict(ctx, 100);
 		pdf_load_name_tree_imp(dict, xref, tree);
 		return dict;
 	}