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, 42 insertions, 42 deletions

diff --git a/fitz/dev_bbox.c b/fitz/dev_bbox.c
index f6028f44..0f2f3cfe 100644
--- a/fitz/dev_bbox.c
+++ b/fitz/dev_bbox.c
@@ -2,95 +2,95 @@
 
 /* TODO: add clip stack and use to intersect bboxes */
 
-typedef struct fz_bboxdevice_s fz_bboxdevice;
+typedef struct fz_bbox_device_s fz_bbox_device;
 
-struct fz_bboxdevice_s
+struct fz_bbox_device_s
 {
 	fz_bbox *bbox;
 };
 
 static void
-fz_bboxfillpath(void *user, fz_path *path, int evenodd, fz_matrix ctm,
+fz_bbox_fill_path(void *user, fz_path *path, int even_odd, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	fz_bboxdevice *bdev = user;
-	fz_bbox bbox = fz_roundrect(fz_boundpath(path, nil, ctm));
-	*bdev->bbox = fz_unionbbox(*bdev->bbox, bbox);
+	fz_bbox_device *bdev = user;
+	fz_bbox bbox = fz_round_rect(fz_bound_path(path, NULL, ctm));
+	*bdev->bbox = fz_union_bbox(*bdev->bbox, bbox);
 }
 
 static void
-fz_bboxstrokepath(void *user, fz_path *path, fz_strokestate *stroke, fz_matrix ctm,
+fz_bbox_stroke_path(void *user, fz_path *path, fz_stroke_state *stroke, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	fz_bboxdevice *bdev = user;
-	fz_bbox bbox = fz_roundrect(fz_boundpath(path, stroke, ctm));
-	*bdev->bbox = fz_unionbbox(*bdev->bbox, bbox);
+	fz_bbox_device *bdev = user;
+	fz_bbox bbox = fz_round_rect(fz_bound_path(path, stroke, ctm));
+	*bdev->bbox = fz_union_bbox(*bdev->bbox, bbox);
 }
 
 static void
-fz_bboxfilltext(void *user, fz_text *text, fz_matrix ctm,
+fz_bbox_fill_text(void *user, fz_text *text, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	fz_bboxdevice *bdev = user;
-	fz_bbox bbox = fz_roundrect(fz_boundtext(text, ctm));
-	*bdev->bbox = fz_unionbbox(*bdev->bbox, bbox);
+	fz_bbox_device *bdev = user;
+	fz_bbox bbox = fz_round_rect(fz_bound_text(text, ctm));
+	*bdev->bbox = fz_union_bbox(*bdev->bbox, bbox);
 }
 
 static void
-fz_bboxstroketext(void *user, fz_text *text, fz_strokestate *stroke, fz_matrix ctm,
+fz_bbox_stroke_text(void *user, fz_text *text, fz_stroke_state *stroke, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	fz_bboxdevice *bdev = user;
-	fz_bbox bbox = fz_roundrect(fz_boundtext(text, ctm));
-	*bdev->bbox = fz_unionbbox(*bdev->bbox, bbox);
+	fz_bbox_device *bdev = user;
+	fz_bbox bbox = fz_round_rect(fz_bound_text(text, ctm));
+	*bdev->bbox = fz_union_bbox(*bdev->bbox, bbox);
 }
 
 static void
-fz_bboxfillshade(void *user, fz_shade *shade, fz_matrix ctm, float alpha)
+fz_bbox_fill_shade(void *user, fz_shade *shade, fz_matrix ctm, float alpha)
 {
-	fz_bboxdevice *bdev = user;
-	fz_bbox bbox = fz_roundrect(fz_boundshade(shade, ctm));
-	*bdev->bbox = fz_unionbbox(*bdev->bbox, bbox);
+	fz_bbox_device *bdev = user;
+	fz_bbox bbox = fz_round_rect(fz_bound_shade(shade, ctm));
+	*bdev->bbox = fz_union_bbox(*bdev->bbox, bbox);
 }
 
 static void
-fz_bboxfillimage(void *user, fz_pixmap *image, fz_matrix ctm, float alpha)
+fz_bbox_fill_image(void *user, fz_pixmap *image, fz_matrix ctm, float alpha)
 {
-	fz_bboxdevice *bdev = user;
-	fz_bbox bbox = fz_roundrect(fz_transformrect(ctm, fz_unitrect));
-	*bdev->bbox = fz_unionbbox(*bdev->bbox, bbox);
+	fz_bbox_device *bdev = user;
+	fz_bbox bbox = fz_round_rect(fz_transform_rect(ctm, fz_unit_rect));
+	*bdev->bbox = fz_union_bbox(*bdev->bbox, bbox);
 }
 
 static void
-fz_bboxfillimagemask(void *user, fz_pixmap *image, fz_matrix ctm,
+fz_bbox_fill_image_mask(void *user, fz_pixmap *image, fz_matrix ctm,
 	fz_colorspace *colorspace, float *color, float alpha)
 {
-	fz_bboxfillimage(user, image, ctm, alpha);
+	fz_bbox_fill_image(user, image, ctm, alpha);
 }
 
 static void
-fz_bboxfreeuser(void *user)
+fz_bbox_free_user(void *user)
 {
-	fz_bboxdevice *bdev = user;
+	fz_bbox_device *bdev = user;
 	fz_free(bdev);
 }
 
 fz_device *
-fz_newbboxdevice(fz_bbox *bboxp)
+fz_new_bbox_device(fz_bbox *bboxp)
 {
 	fz_device *dev;
-	fz_bboxdevice *bdev = fz_malloc(sizeof(fz_bboxdevice));
+	fz_bbox_device *bdev = fz_malloc(sizeof(fz_bbox_device));
 	bdev->bbox = bboxp;
-	*bdev->bbox = fz_emptybbox;
+	*bdev->bbox = fz_empty_bbox;
 
-	dev = fz_newdevice(bdev);
-	dev->freeuser = fz_bboxfreeuser;
-	dev->fillpath = fz_bboxfillpath;
-	dev->strokepath = fz_bboxstrokepath;
-	dev->filltext = fz_bboxfilltext;
-	dev->stroketext = fz_bboxstroketext;
-	dev->fillshade = fz_bboxfillshade;
-	dev->fillimage = fz_bboxfillimage;
-	dev->fillimagemask = fz_bboxfillimagemask;
+	dev = fz_new_device(bdev);
+	dev->free_user = fz_bbox_free_user;
+	dev->fill_path = fz_bbox_fill_path;
+	dev->stroke_path = fz_bbox_stroke_path;
+	dev->fill_text = fz_bbox_fill_text;
+	dev->stroke_text = fz_bbox_stroke_text;
+	dev->fill_shade = fz_bbox_fill_shade;
+	dev->fill_image = fz_bbox_fill_image;
+	dev->fill_image_mask = fz_bbox_fill_image_mask;
 	return dev;
 }