Commit 859829d4 authored by Adam D. Moss's avatar Adam D. Moss
Browse files

minor function renaming.

parent ee4115a8
......@@ -299,7 +299,7 @@ rgb_to_xyz (double *inr_outx,
/* call this before using the CPercep function */
void
init_conversions(void)
cpercep_init_conversions(void)
{
rgbxyzrgb_init();
}
......@@ -440,8 +440,8 @@ lab_to_xyz (double *inl,
void
rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
cpercep_rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
{
#ifdef APPROX
#ifdef SANITY
......@@ -517,8 +517,8 @@ rgb_to_space (double inr, double ing, double inb,
void
space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
cpercep_space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
{
lab_to_xyz(&inr, &ing, &inb);
......
......@@ -34,21 +34,21 @@ from the Author.
*/
void
init_conversions(void);
cpercep_init_conversions(void);
void
rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
cpercep_rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
void
space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
cpercep_space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
/* This is in the header so that it can potentially be inlined. */
static const double
distance_space (const double L1, const double a1, const double b1,
const double L2, const double a2, const double b2)
cpercep_distance_space (const double L1, const double a1, const double b1,
const double L2, const double a2, const double b2)
{
const double Ld = L1 - L2;
const double ad = a1 - a2;
......
......@@ -299,7 +299,7 @@ rgb_to_xyz (double *inr_outx,
/* call this before using the CPercep function */
void
init_conversions(void)
cpercep_init_conversions(void)
{
rgbxyzrgb_init();
}
......@@ -440,8 +440,8 @@ lab_to_xyz (double *inl,
void
rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
cpercep_rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
{
#ifdef APPROX
#ifdef SANITY
......@@ -517,8 +517,8 @@ rgb_to_space (double inr, double ing, double inb,
void
space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
cpercep_space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb)
{
lab_to_xyz(&inr, &ing, &inb);
......
......@@ -34,21 +34,21 @@ from the Author.
*/
void
init_conversions(void);
cpercep_init_conversions(void);
void
rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
cpercep_rgb_to_space (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
void
space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
cpercep_space_to_rgb (double inr, double ing, double inb,
double* outr, double* outg, double* outb);
/* This is in the header so that it can potentially be inlined. */
static const double
distance_space (const double L1, const double a1, const double b1,
const double L2, const double a2, const double b2)
cpercep_distance_space (const double L1, const double a1, const double b1,
const double L2, const double a2, const double b2)
{
const double Ld = L1 - L2;
const double ad = a1 - a2;
......
......@@ -305,7 +305,7 @@ void rgb_to_unshifted_lin(const unsigned char r,
double sL, sa, sb;
int or, og, ob;
rgb_to_space(r,g,b, &sL, &sa, &sb);
cpercep_rgb_to_space(r,g,b, &sL, &sa, &sb);
/* fprintf(stderr, " %d-%d-%d -> %0.3f,%0.3f,%0.3f ", r, g, b, sL, sa, sb);*/
......@@ -352,7 +352,7 @@ void rgb_to_lin(const unsigned char r,
for (g=0; g<256; g++)
for (b=0; b<256; b++)
{
rgb_to_space(r,g,b, &sL, &sa, &sb);
cpercep_rgb_to_space(r,g,b, &sL, &sa, &sb);
if (sL > high_l)
high_l = sL;
......@@ -441,8 +441,8 @@ void lin_to_rgb(const double hr, const double hg, const double hb,
/* fprintf(stderr, "%0.1f,%0.1f,%0.1f ", ir,ig,ib); */
space_to_rgb(ir, ig, ib,
&sr, &sg, &sb);
cpercep_space_to_rgb(ir, ig, ib,
&sr, &sg, &sb);
*r = RINT(CLAMP(sr, 0.0F, 255.0F));
*g = RINT(CLAMP(sg, 0.0F, 255.0F));
......@@ -751,7 +751,7 @@ gimp_image_convert (GimpImage *gimage,
gimage->base_type = new_type;
/* initialize the colour conversion routines */
init_conversions();
cpercep_init_conversions();
/* Convert to indexed? Build histogram if necessary. */
if (new_type == GIMP_INDEXED)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment