From 41efcdecc0364c2ffcd50466df71399f5674898f Mon Sep 17 00:00:00 2001
From: sam <sam@92316355-f0b4-4df1-b90c-862c8a59935f>
Date: Mon, 4 Aug 2008 17:23:44 +0000
Subject: [PATCH] * Prefix dithering functions with _dither_ to avoid
namespace cluttering.
git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@2666 92316355-f0b4-4df1-b90c-862c8a59935f
---
examples/dither.c | 18 ++++++++++++------
examples/edd.c | 2 +-
pipi/dither/dbs.c | 2 +-
pipi/dither/floydsteinberg.c | 2 +-
pipi/dither/ostromoukhov.c | 2 +-
pipi/pipi.h | 6 +++---
6 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/examples/dither.c b/examples/dither.c
index ece8206..2dcbb67 100644
--- a/examples/dither.c
+++ b/examples/dither.c
@@ -33,18 +33,24 @@ int main(int argc, char *argv[])
switch(atoi(argv[2]))
{
case 6:
- newimg = pipi_dbs(img); break;
+ newimg = pipi_dither_dbs(img);
+ break;
case 5:
- newimg = pipi_ostromoukhov(img, PIPI_SCAN_SERPENTINE); break;
+ newimg = pipi_dither_ostromoukhov(img, PIPI_SCAN_SERPENTINE);
+ break;
case 4:
- newimg = pipi_ostromoukhov(img, PIPI_SCAN_RASTER); break;
+ newimg = pipi_dither_ostromoukhov(img, PIPI_SCAN_RASTER);
+ break;
case 3:
- newimg = pipi_floydsteinberg(img, PIPI_SCAN_SERPENTINE); break;
+ newimg = pipi_dither_floydsteinberg(img, PIPI_SCAN_SERPENTINE);
+ break;
case 2:
- newimg = pipi_floydsteinberg(img, PIPI_SCAN_RASTER); break;
+ newimg = pipi_dither_floydsteinberg(img, PIPI_SCAN_RASTER);
+ break;
case 1:
default:
- newimg = pipi_dither_ordered(img); break;
+ newimg = pipi_dither_ordered(img);
+ break;
}
pipi_free(img);
diff --git a/examples/edd.c b/examples/edd.c
index 733b7e2..648b758 100644
--- a/examples/edd.c
+++ b/examples/edd.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
img = pipi_load(argv[1]);
pipi_getpixels(img, PIPI_PIXELS_Y_F);
gauss = pipi_gaussian_blur(img, sigma);
- dither = pipi_floydsteinberg(img, PIPI_SCAN_RASTER);
+ dither = pipi_dither_floydsteinberg(img, PIPI_SCAN_RASTER);
pipi_free(img);
/* Compute the standard error */
diff --git a/pipi/dither/dbs.c b/pipi/dither/dbs.c
index 2efead2..2cd8682 100644
--- a/pipi/dither/dbs.c
+++ b/pipi/dither/dbs.c
@@ -35,7 +35,7 @@
/* FIXME: though the algorithm is supposed to stop, we do not have a real,
* guaranteed stop condition here. */
-pipi_image_t *pipi_dbs(pipi_image_t *src)
+pipi_image_t *pipi_dither_dbs(pipi_image_t *src)
{
double kernel[NN * NN];
double t = 0.;
diff --git a/pipi/dither/floydsteinberg.c b/pipi/dither/floydsteinberg.c
index 5df7fac..618f2e1 100644
--- a/pipi/dither/floydsteinberg.c
+++ b/pipi/dither/floydsteinberg.c
@@ -22,7 +22,7 @@
#include "pipi.h"
#include "pipi_internals.h"
-pipi_image_t *pipi_floydsteinberg(pipi_image_t *src, pipi_scan_t scan)
+pipi_image_t *pipi_dither_floydsteinberg(pipi_image_t *src, pipi_scan_t scan)
{
pipi_image_t *dst;
pipi_pixels_t *srcp, *dstp;
diff --git a/pipi/dither/ostromoukhov.c b/pipi/dither/ostromoukhov.c
index 74bc1c5..d025f33 100644
--- a/pipi/dither/ostromoukhov.c
+++ b/pipi/dither/ostromoukhov.c
@@ -66,7 +66,7 @@ static int const table[][3] =
{385, 112, 103}, {65, 18, 17}, {395, 104, 101}, {4, 1, 1}
};
-pipi_image_t *pipi_ostromoukhov(pipi_image_t *src, pipi_scan_t scan)
+pipi_image_t *pipi_dither_ostromoukhov(pipi_image_t *src, pipi_scan_t scan)
{
pipi_image_t *dst;
pipi_pixels_t *srcp, *dstp;
diff --git a/pipi/pipi.h b/pipi/pipi.h
index 2d219e1..d393ffc 100644
--- a/pipi/pipi.h
+++ b/pipi/pipi.h
@@ -78,10 +78,10 @@ extern pipi_image_t *pipi_gaussian_blur(pipi_image_t *, float);
extern pipi_image_t *pipi_gaussian_blur_ext(pipi_image_t *,
float, float, float, float);
-extern pipi_image_t *pipi_floydsteinberg(pipi_image_t *, pipi_scan_t);
+extern pipi_image_t *pipi_dither_floydsteinberg(pipi_image_t *, pipi_scan_t);
extern pipi_image_t *pipi_dither_ordered(pipi_image_t *);
-extern pipi_image_t *pipi_ostromoukhov(pipi_image_t *, pipi_scan_t);
-extern pipi_image_t *pipi_dbs(pipi_image_t *);
+extern pipi_image_t *pipi_dither_ostromoukhov(pipi_image_t *, pipi_scan_t);
+extern pipi_image_t *pipi_dither_dbs(pipi_image_t *);
extern void pipi_dither_24to16(pipi_image_t *);
extern void pipi_test(pipi_image_t *);