great free -> drop renaming

5 files changed, 24 insertions, 25 deletions

diff --git a/render/edgelist.c b/render/edgelist.c
index d62ffad4..9bcc92b1 100644
--- a/render/edgelist.c
+++ b/render/edgelist.c
@@ -46,7 +46,7 @@ fz_resetgel(fz_gel *gel, int hs, int vs)
 }
 
 void
-fz_freegel(fz_gel *gel)
+fz_dropgel(fz_gel *gel)
 {
 	fz_free(gel->edges);
 	fz_free(gel);
@@ -196,7 +196,7 @@ fz_newael(fz_ael **aelp)
 }
 
 void
-fz_freeael(fz_ael *ael)
+fz_dropael(fz_ael *ael)
 {
 	fz_free(ael->edges);
 	fz_free(ael);
diff --git a/render/glyphcache.c b/render/glyphcache.c
index beb77ccc..e92b472e 100644
--- a/render/glyphcache.c
+++ b/render/glyphcache.c
@@ -103,7 +103,7 @@ cleanup:
 }
 
 void
-fz_freeglyphcache(fz_glyphcache *arena)
+fz_dropglyphcache(fz_glyphcache *arena)
 {
 	fz_free(arena->hash);
 	fz_free(arena->lru);	
diff --git a/render/pixmap.c b/render/pixmap.c
index acb1d1d2..634fe8f6 100644
--- a/render/pixmap.c
+++ b/render/pixmap.c
@@ -27,7 +27,7 @@ fz_newpixmap(fz_pixmap **pixp, int x, int y, int w, int h, int n)
 }
 
 void
-fz_freepixmap(fz_pixmap *pix)
+fz_droppixmap(fz_pixmap *pix)
 {
 	fz_free(pix->samples);
 	fz_free(pix);
diff --git a/render/render.c b/render/render.c
index d1eb6136..6b2d5e29 100644
--- a/render/render.c
+++ b/render/render.c
@@ -42,29 +42,29 @@ fz_newrenderer(fz_renderer **gcp, fz_colorspace *processcolormodel)
 
 cleanup:
 	if (gc->cache)
-		fz_freeglyphcache(gc->cache);
+		fz_dropglyphcache(gc->cache);
 	if (gc->gel)
-		fz_freegel(gc->gel);
+		fz_dropgel(gc->gel);
 	if (gc->ael)
-		fz_freeael(gc->ael);
+		fz_dropael(gc->ael);
 	fz_free(gc);
 
 	return error;
 }
 
 void
-fz_freerenderer(fz_renderer *gc)
+fz_droprenderer(fz_renderer *gc)
 {
 	if (gc->cache)
-		fz_freeglyphcache(gc->cache);
+		fz_dropglyphcache(gc->cache);
 	if (gc->gel)
-		fz_freegel(gc->gel);
+		fz_dropgel(gc->gel);
 	if (gc->ael)
-		fz_freeael(gc->ael);
+		fz_dropael(gc->ael);
 	if (gc->tmp)
-		fz_freepixmap(gc->tmp);
+		fz_droppixmap(gc->tmp);
 	if (gc->acc)
-		fz_freepixmap(gc->acc);
+		fz_droppixmap(gc->acc);
 	fz_free(gc);
 }
 
@@ -125,7 +125,7 @@ fz_renderoverchild(fz_renderer *gc, fz_node *node, fz_matrix ctm)
 //printf("over dst ");fz_debugpixmap(gc->acc);getchar();
 		fz_blendover(gc->tmp, gc->acc);
 //printf("over res ");fz_debugpixmap(gc->acc);getchar();
-		fz_freepixmap(gc->tmp);
+		fz_droppixmap(gc->tmp);
 		gc->tmp = nil;
 	}
 
@@ -229,8 +229,8 @@ if (!shapepix) return nil;
 //printf("mask shape");fz_debugpixmap(shapepix);getchar();
 //printf("mask blend");fz_debugpixmap(gc->tmp);getchar();
 
-	fz_freepixmap(shapepix);
-	fz_freepixmap(colorpix);
+	fz_droppixmap(shapepix);
+	fz_droppixmap(colorpix);
 
 	gc->mode = oldmode;
 
diff --git a/render/renderimage.c b/render/renderimage.c
index 37c32fae..c82d411c 100644
--- a/render/renderimage.c
+++ b/render/renderimage.c
@@ -185,7 +185,7 @@ printf("renderimage s=%gx%g/%dx%d d=%d,%d\n", sx, sy, w, h, dx, dy);
 
 	error = fz_newpixmap(&tile1, 0, 0, w, h, n + 1);
 
-printf("  load tile\n");
+printf("  load tile %d x %d\n", w, h);
 	error = image->loadtile(image, tile1);
 //fz_debugpixmap(tile1);getchar();
 
@@ -195,7 +195,7 @@ printf("  scale tile 1/%d x 1/%d\n", dx, dy);
 //		fz_gammapixmap(tile1, 1.0 / GAMMA);
 		error = fz_scalepixmap(&tile2, tile1, dx, dy);
 //		fz_gammapixmap(tile2, GAMMA);
-		fz_freepixmap(tile1);
+		fz_droppixmap(tile1);
 	}
 	else
 		tile2 = tile1;
@@ -203,7 +203,7 @@ printf("  scale tile 1/%d x 1/%d\n", dx, dy);
 	/* render image mask */
 	if (n == 0 && a == 1)
 	{
-printf("draw image mask\n");
+printf("  draw image mask\n");
 		error = fz_newpixmap(&gc->tmp, gc->x, gc->y, gc->w, gc->h, 1);
 		fz_clearpixmap(gc->tmp);
 		error = drawtile(gc, gc->tmp, tile2, ctm, 0);
@@ -212,23 +212,22 @@ printf("draw image mask\n");
 	/* render rgb over */
 	else if (n == 3 && a == 0 && gc->acc)
 	{
-printf("draw image rgb over\n");
+printf("  draw image rgb over\n");
 		error = drawtile(gc, gc->acc, tile2, ctm, 1);
 	}
 
 	/* render generic image */
 	else
 	{
-printf("draw generic image\n");
+printf("  draw image rgb over after cs transform\n");
 		error = fz_convertpixmap(&tile3, tile2, cs, gc->model);
 		error = fz_newpixmap(&gc->tmp, gc->x, gc->y, gc->w, gc->h, gc->model->n + 1);
 		fz_clearpixmap(gc->tmp);
-		error = drawtile(gc, gc->tmp, tile3, ctm, 0);
-//fz_debugpixmap(gc->tmp);getchar();
-		fz_freepixmap(tile3);
+		error = drawtile(gc, gc->tmp, tile3, ctm, 1);
+		fz_droppixmap(tile3);
 	}
 
-	fz_freepixmap(tile2);
+	fz_droppixmap(tile2);
 	return nil;
 }