Le Roi est mort, vive le Roi!

The run-together words are dead! Long live the underscores!

The postscript inspired naming convention of using all run-together
words has served us well, but it is now time for more readable code.

In this commit I have also added the sed script, rename.sed, that I used
to convert the source. Use it on your patches and application code.

1 files changed, 38 insertions, 38 deletions

diff --git a/pdf/pdf_xobject.c b/pdf/pdf_xobject.c
index 44389efc..86360d3a 100644
--- a/pdf/pdf_xobject.c
+++ b/pdf/pdf_xobject.c
@@ -2,43 +2,43 @@
 #include "mupdf.h"
 
 fz_error
-pdf_loadxobject(pdf_xobject **formp, pdf_xref *xref, fz_obj *dict)
+pdf_load_xobject(pdf_xobject **formp, pdf_xref *xref, fz_obj *dict)
 {
 	fz_error error;
 	pdf_xobject *form;
 	fz_obj *obj;
 
-	if ((*formp = pdf_finditem(xref->store, pdf_dropxobject, dict)))
+	if ((*formp = pdf_find_item(xref->store, pdf_drop_xobject, dict)))
 	{
-		pdf_keepxobject(*formp);
+		pdf_keep_xobject(*formp);
 		return fz_okay;
 	}
 
 	form = fz_malloc(sizeof(pdf_xobject));
 	form->refs = 1;
-	form->resources = nil;
-	form->contents = nil;
-	form->colorspace = nil;
+	form->resources = NULL;
+	form->contents = NULL;
+	form->colorspace = NULL;
 
-	pdf_logrsrc("load xobject (%d %d R) ptr=%p {\n", fz_tonum(dict), fz_togen(dict), form);
+	pdf_log_rsrc("load xobject (%d %d R) ptr=%p {\n", fz_to_num(dict), fz_to_gen(dict), form);
 
 	/* Store item immediately, to avoid possible recursion if objects refer back to this one */
-	pdf_storeitem(xref->store, pdf_keepxobject, pdf_dropxobject, dict, form);
+	pdf_store_item(xref->store, pdf_keep_xobject, pdf_drop_xobject, dict, form);
 
-	obj = fz_dictgets(dict, "BBox");
-	form->bbox = pdf_torect(obj);
+	obj = fz_dict_gets(dict, "BBox");
+	form->bbox = pdf_to_rect(obj);
 
-	pdf_logrsrc("bbox [%g %g %g %g]\n",
+	pdf_log_rsrc("bbox [%g %g %g %g]\n",
 		form->bbox.x0, form->bbox.y0,
 		form->bbox.x1, form->bbox.y1);
 
-	obj = fz_dictgets(dict, "Matrix");
+	obj = fz_dict_gets(dict, "Matrix");
 	if (obj)
-		form->matrix = pdf_tomatrix(obj);
+		form->matrix = pdf_to_matrix(obj);
 	else
 		form->matrix = fz_identity;
 
-	pdf_logrsrc("matrix [%g %g %g %g %g %g]\n",
+	pdf_log_rsrc("matrix [%g %g %g %g %g %g]\n",
 		form->matrix.a, form->matrix.b,
 		form->matrix.c, form->matrix.d,
 		form->matrix.e, form->matrix.f);
@@ -47,69 +47,69 @@ pdf_loadxobject(pdf_xobject **formp, pdf_xref *xref, fz_obj *dict)
 	form->knockout = 0;
 	form->transparency = 0;
 
-	obj = fz_dictgets(dict, "Group");
+	obj = fz_dict_gets(dict, "Group");
 	if (obj)
 	{
 		fz_obj *attrs = obj;
 
-		form->isolated = fz_tobool(fz_dictgets(attrs, "I"));
-		form->knockout = fz_tobool(fz_dictgets(attrs, "K"));
+		form->isolated = fz_to_bool(fz_dict_gets(attrs, "I"));
+		form->knockout = fz_to_bool(fz_dict_gets(attrs, "K"));
 
-		obj = fz_dictgets(attrs, "S");
-		if (fz_isname(obj) && !strcmp(fz_toname(obj), "Transparency"))
+		obj = fz_dict_gets(attrs, "S");
+		if (fz_is_name(obj) && !strcmp(fz_to_name(obj), "Transparency"))
 			form->transparency = 1;
 
-		obj = fz_dictgets(attrs, "CS");
+		obj = fz_dict_gets(attrs, "CS");
 		if (obj)
 		{
-			error = pdf_loadcolorspace(&form->colorspace, xref, obj);
+			error = pdf_load_colorspace(&form->colorspace, xref, obj);
 			if (error)
 				fz_catch(error, "cannot load xobject colorspace");
-			pdf_logrsrc("colorspace %s\n", form->colorspace->name);
+			pdf_log_rsrc("colorspace %s\n", form->colorspace->name);
 		}
 	}
 
-	pdf_logrsrc("isolated %d\n", form->isolated);
-	pdf_logrsrc("knockout %d\n", form->knockout);
-	pdf_logrsrc("transparency %d\n", form->transparency);
+	pdf_log_rsrc("isolated %d\n", form->isolated);
+	pdf_log_rsrc("knockout %d\n", form->knockout);
+	pdf_log_rsrc("transparency %d\n", form->transparency);
 
-	form->resources = fz_dictgets(dict, "Resources");
+	form->resources = fz_dict_gets(dict, "Resources");
 	if (form->resources)
-		fz_keepobj(form->resources);
+		fz_keep_obj(form->resources);
 
-	error = pdf_loadstream(&form->contents, xref, fz_tonum(dict), fz_togen(dict));
+	error = pdf_load_stream(&form->contents, xref, fz_to_num(dict), fz_to_gen(dict));
 	if (error)
 	{
-		pdf_removeitem(xref->store, pdf_dropxobject, dict);
-		pdf_dropxobject(form);
-		return fz_rethrow(error, "cannot load xobject content stream (%d %d R)", fz_tonum(dict), fz_togen(dict));
+		pdf_remove_item(xref->store, pdf_drop_xobject, dict);
+		pdf_drop_xobject(form);
+		return fz_rethrow(error, "cannot load xobject content stream (%d %d R)", fz_to_num(dict), fz_to_gen(dict));
 	}
 
-	pdf_logrsrc("stream %d bytes\n", form->contents->len);
-	pdf_logrsrc("}\n");
+	pdf_log_rsrc("stream %d bytes\n", form->contents->len);
+	pdf_log_rsrc("}\n");
 
 	*formp = form;
 	return fz_okay;
 }
 
 pdf_xobject *
-pdf_keepxobject(pdf_xobject *xobj)
+pdf_keep_xobject(pdf_xobject *xobj)
 {
 	xobj->refs ++;
 	return xobj;
 }
 
 void
-pdf_dropxobject(pdf_xobject *xobj)
+pdf_drop_xobject(pdf_xobject *xobj)
 {
 	if (xobj && --xobj->refs == 0)
 	{
 		if (xobj->colorspace)
-			fz_dropcolorspace(xobj->colorspace);
+			fz_drop_colorspace(xobj->colorspace);
 		if (xobj->resources)
-			fz_dropobj(xobj->resources);
+			fz_drop_obj(xobj->resources);
 		if (xobj->contents)
-			fz_dropbuffer(xobj->contents);
+			fz_drop_buffer(xobj->contents);
 		fz_free(xobj);
 	}
 }