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

diff --git a/fitz/res_pixmap.c b/fitz/res_pixmap.c
index 85138be1..7e689e07 100644
--- a/fitz/res_pixmap.c
+++ b/fitz/res_pixmap.c
@@ -1,7 +1,7 @@
 #include "fitz.h"
 
 fz_pixmap *
-fz_newpixmapwithdata(fz_colorspace *colorspace, int x, int y, int w, int h, unsigned char *samples)
+fz_new_pixmap_with_data(fz_colorspace *colorspace, int x, int y, int w, int h, unsigned char *samples)
 {
 	fz_pixmap *pix;
 
@@ -11,75 +11,75 @@ fz_newpixmapwithdata(fz_colorspace *colorspace, int x, int y, int w, int h, unsi
 	pix->y = y;
 	pix->w = w;
 	pix->h = h;
-	pix->mask = nil;
+	pix->mask = NULL;
 	pix->interpolate = 1;
 	pix->xres = 96;
 	pix->yres = 96;
-	pix->colorspace = nil;
+	pix->colorspace = NULL;
 	pix->n = 1;
 
 	if (colorspace)
 	{
-		pix->colorspace = fz_keepcolorspace(colorspace);
+		pix->colorspace = fz_keep_colorspace(colorspace);
 		pix->n = 1 + colorspace->n;
 	}
 
 	if (samples)
 	{
 		pix->samples = samples;
-		pix->freesamples = 0;
+		pix->free_samples = 0;
 	}
 	else
 	{
 		pix->samples = fz_calloc(pix->h, pix->w * pix->n);
-		pix->freesamples = 1;
+		pix->free_samples = 1;
 	}
 
 	return pix;
 }
 
 fz_pixmap *
-fz_newpixmap(fz_colorspace *colorspace, int x, int y, int w, int h)
+fz_new_pixmap(fz_colorspace *colorspace, int x, int y, int w, int h)
 {
-	return fz_newpixmapwithdata(colorspace, x, y, w, h, nil);
+	return fz_new_pixmap_with_data(colorspace, x, y, w, h, NULL);
 }
 
 fz_pixmap *
-fz_newpixmapwithrect(fz_colorspace *colorspace, fz_bbox r)
+fz_new_pixmap_with_rect(fz_colorspace *colorspace, fz_bbox r)
 {
-	return fz_newpixmap(colorspace, r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
+	return fz_new_pixmap(colorspace, r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
 }
 
 fz_pixmap *
-fz_keeppixmap(fz_pixmap *pix)
+fz_keep_pixmap(fz_pixmap *pix)
 {
 	pix->refs++;
 	return pix;
 }
 
 void
-fz_droppixmap(fz_pixmap *pix)
+fz_drop_pixmap(fz_pixmap *pix)
 {
 	if (pix && --pix->refs == 0)
 	{
 		if (pix->mask)
-			fz_droppixmap(pix->mask);
+			fz_drop_pixmap(pix->mask);
 		if (pix->colorspace)
-			fz_dropcolorspace(pix->colorspace);
-		if (pix->freesamples)
+			fz_drop_colorspace(pix->colorspace);
+		if (pix->free_samples)
 			fz_free(pix->samples);
 		fz_free(pix);
 	}
 }
 
 void
-fz_clearpixmap(fz_pixmap *pix)
+fz_clear_pixmap(fz_pixmap *pix)
 {
 	memset(pix->samples, 0, pix->w * pix->h * pix->n);
 }
 
 void
-fz_clearpixmapwithcolor(fz_pixmap *pix, int value)
+fz_clear_pixmap_with_color(fz_pixmap *pix, int value)
 {
 	if (value == 255)
 		memset(pix->samples, 255, pix->w * pix->h * pix->n);
@@ -100,7 +100,7 @@ fz_clearpixmapwithcolor(fz_pixmap *pix, int value)
 }
 
 void
-fz_premultiplypixmap(fz_pixmap *pix)
+fz_premultiply_pixmap(fz_pixmap *pix)
 {
 	unsigned char *s = pix->samples;
 	unsigned char a;
@@ -119,7 +119,7 @@ fz_premultiplypixmap(fz_pixmap *pix)
 }
 
 fz_bbox
-fz_boundpixmap(fz_pixmap *pix)
+fz_bound_pixmap(fz_pixmap *pix)
 {
 	fz_bbox bbox;
 	bbox.x0 = pix->x;
@@ -130,7 +130,7 @@ fz_boundpixmap(fz_pixmap *pix)
 }
 
 fz_pixmap *
-fz_alphafromgray(fz_pixmap *gray, int luminosity)
+fz_alpha_from_gray(fz_pixmap *gray, int luminosity)
 {
 	fz_pixmap *alpha;
 	unsigned char *sp, *dp;
@@ -138,7 +138,7 @@ fz_alphafromgray(fz_pixmap *gray, int luminosity)
 
 	assert(gray->n == 2);
 
-	alpha = fz_newpixmap(nil, gray->x, gray->y, gray->w, gray->h);
+	alpha = fz_new_pixmap(NULL, gray->x, gray->y, gray->w, gray->h);
 	dp = alpha->samples;
 	sp = gray->samples;
 	if (!luminosity)
@@ -159,7 +159,7 @@ fz_alphafromgray(fz_pixmap *gray, int luminosity)
  */
 
 fz_error
-fz_writepnm(fz_pixmap *pixmap, char *filename)
+fz_write_pnm(fz_pixmap *pixmap, char *filename)
 {
 	FILE *fp;
 	unsigned char *p;
@@ -213,7 +213,7 @@ fz_writepnm(fz_pixmap *pixmap, char *filename)
  */
 
 fz_error
-fz_writepam(fz_pixmap *pixmap, char *filename, int savealpha)
+fz_write_pam(fz_pixmap *pixmap, char *filename, int savealpha)
 {
 	unsigned char *sp;
 	int y, w, k;
@@ -289,14 +289,14 @@ static void putchunk(char *tag, unsigned char *data, int size, FILE *fp)
 	put32(size, fp);
 	fwrite(tag, 1, 4, fp);
 	fwrite(data, 1, size, fp);
-	sum = crc32(0, nil, 0);
+	sum = crc32(0, NULL, 0);
 	sum = crc32(sum, (unsigned char*)tag, 4);
 	sum = crc32(sum, data, size);
 	put32(sum, fp);
 }
 
 fz_error
-fz_writepng(fz_pixmap *pixmap, char *filename, int savealpha)
+fz_write_png(fz_pixmap *pixmap, char *filename, int savealpha)
 {
 	static const unsigned char pngsig[8] = { 137, 80, 78, 71, 13, 10, 26, 10 };
 	FILE *fp;