dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More preparation for LibGCK removal: 

2000-12-31  Michael Natterer  <mitch@gimp.org>

	More preparation for LibGCK removal:

	* libgimp/gimpcolorspace.[ch]: added a "_int" suffix to all functions
	operating on 3 gint pointers, just like the gdouble functions have
	a "_double" suffix.

	* app/color_balance.c
	* app/hue_saturation.c
	* app/paint_funcs.c
	* modules/colorsel_triangle.c
	* plug-ins/common/CML_explorer.c
	* plug-ins/common/scatter_hsv.c
	* plug-ins/common/sparkle.c
	* plug-ins/common/vinvert.c
	* plug-ins/gflare/gflare.c: changed accordingly.
This commit is contained in:
Michael Natterer 2000-12-31 14:58:08 +00:00 committed by Michael Natterer
parent f7ccaf1bcf
commit 40916e0951
19 changed files with 1519 additions and 1377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
2000-12-31 Michael Natterer <mitch@gimp.org>
More preparation for LibGCK removal:
* libgimp/gimpcolorspace.[ch]: added a "_int" suffix to all functions
operating on 3 gint pointers, just like the gdouble functions have
a "_double" suffix.
* app/color_balance.c
* app/hue_saturation.c
* app/paint_funcs.c
* modules/colorsel_triangle.c
* plug-ins/common/CML_explorer.c
* plug-ins/common/scatter_hsv.c
* plug-ins/common/sparkle.c
* plug-ins/common/vinvert.c
* plug-ins/gflare/gflare.c: changed accordingly.
2000-12-31 Sven Neumann <sven@gimp.org>
Simon Budig <simon@gimp.org>

6
app/base/color-balance.c
View File

@ -129,9 +129,9 @@ color_balance (PixelRegion *srcPR,
if (cbd->preserve_luminosity)
{
gimp_rgb_to_hls (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l (r, g, b);
gimp_hls_to_rgb (&r_n, &g_n, &b_n);
gimp_rgb_to_hls_int (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l_int (r, g, b);
gimp_hls_to_rgb_int (&r_n, &g_n, &b_n);
}
d[RED_PIX] = r_n;

8
app/base/hue-saturation.c
View File

@ -192,7 +192,7 @@ hue_saturation (PixelRegion *srcPR,
g = s[GREEN_PIX];
b = s[BLUE_PIX];
gimp_rgb_to_hls (&r, &g, &b);
gimp_rgb_to_hls_int (&r, &g, &b);
if (r < 43)
hue = 0;
@ -211,7 +211,7 @@ hue_saturation (PixelRegion *srcPR,
g = lightness_transfer[hue][g];
b = saturation_transfer[hue][b];
gimp_hls_to_rgb (&r, &g, &b);
gimp_hls_to_rgb_int (&r, &g, &b);
d[RED_PIX] = r;
d[GREEN_PIX] = g;
@ -636,13 +636,13 @@ hue_saturation_update (HueSaturationDialog *hsd,
rgb[GREEN_PIX] = default_colors[i][GREEN_PIX];
rgb[BLUE_PIX] = default_colors[i][BLUE_PIX];
gimp_rgb_to_hls (rgb, rgb + 1, rgb + 2);
gimp_rgb_to_hls_int (rgb, rgb + 1, rgb + 2);
rgb[RED_PIX] = hue_transfer[i][rgb[RED_PIX]];
rgb[GREEN_PIX] = lightness_transfer[i][rgb[GREEN_PIX]];
rgb[BLUE_PIX] = saturation_transfer[i][rgb[BLUE_PIX]];
gimp_hls_to_rgb (rgb, rgb + 1, rgb + 2);
gimp_hls_to_rgb_int (rgb, rgb + 1, rgb + 2);
for (j = 0; j < DA_WIDTH; j++)
for (b = 0; b < 3; b++)

6
app/color_balance.c
View File

@ -129,9 +129,9 @@ color_balance (PixelRegion *srcPR,
if (cbd->preserve_luminosity)
{
gimp_rgb_to_hls (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l (r, g, b);
gimp_hls_to_rgb (&r_n, &g_n, &b_n);
gimp_rgb_to_hls_int (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l_int (r, g, b);
gimp_hls_to_rgb_int (&r_n, &g_n, &b_n);
}
d[RED_PIX] = r_n;

8
app/hue_saturation.c
View File

@ -192,7 +192,7 @@ hue_saturation (PixelRegion *srcPR,
g = s[GREEN_PIX];
b = s[BLUE_PIX];
gimp_rgb_to_hls (&r, &g, &b);
gimp_rgb_to_hls_int (&r, &g, &b);
if (r < 43)
hue = 0;
@ -211,7 +211,7 @@ hue_saturation (PixelRegion *srcPR,
g = lightness_transfer[hue][g];
b = saturation_transfer[hue][b];
gimp_hls_to_rgb (&r, &g, &b);
gimp_hls_to_rgb_int (&r, &g, &b);
d[RED_PIX] = r;
d[GREEN_PIX] = g;
@ -636,13 +636,13 @@ hue_saturation_update (HueSaturationDialog *hsd,
rgb[GREEN_PIX] = default_colors[i][GREEN_PIX];
rgb[BLUE_PIX] = default_colors[i][BLUE_PIX];
gimp_rgb_to_hls (rgb, rgb + 1, rgb + 2);
gimp_rgb_to_hls_int (rgb, rgb + 1, rgb + 2);
rgb[RED_PIX] = hue_transfer[i][rgb[RED_PIX]];
rgb[GREEN_PIX] = lightness_transfer[i][rgb[GREEN_PIX]];
rgb[BLUE_PIX] = saturation_transfer[i][rgb[BLUE_PIX]];
gimp_hls_to_rgb (rgb, rgb + 1, rgb + 2);
gimp_hls_to_rgb_int (rgb, rgb + 1, rgb + 2);
for (j = 0; j < DA_WIDTH; j++)
for (b = 0; b < 3; b++)

1368
app/paint-funcs/paint-funcs.c
View File

File diff suppressed because it is too large Load Diff

1368
app/paint_funcs.c
View File

File diff suppressed because it is too large Load Diff

6
app/tools/color_balance.c
View File

@ -129,9 +129,9 @@ color_balance (PixelRegion *srcPR,
if (cbd->preserve_luminosity)
{
gimp_rgb_to_hls (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l (r, g, b);
gimp_hls_to_rgb (&r_n, &g_n, &b_n);
gimp_rgb_to_hls_int (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l_int (r, g, b);
gimp_hls_to_rgb_int (&r_n, &g_n, &b_n);
}
d[RED_PIX] = r_n;

6
app/tools/gimpcolorbalancetool.c
View File

@ -129,9 +129,9 @@ color_balance (PixelRegion *srcPR,
if (cbd->preserve_luminosity)
{
gimp_rgb_to_hls (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l (r, g, b);
gimp_hls_to_rgb (&r_n, &g_n, &b_n);
gimp_rgb_to_hls_int (&r_n, &g_n, &b_n);
g_n = gimp_rgb_to_l_int (r, g, b);
gimp_hls_to_rgb_int (&r_n, &g_n, &b_n);
}
d[RED_PIX] = r_n;

8
app/tools/gimphuesaturationtool.c
View File

@ -192,7 +192,7 @@ hue_saturation (PixelRegion *srcPR,
g = s[GREEN_PIX];
b = s[BLUE_PIX];
gimp_rgb_to_hls (&r, &g, &b);
gimp_rgb_to_hls_int (&r, &g, &b);
if (r < 43)
hue = 0;
@ -211,7 +211,7 @@ hue_saturation (PixelRegion *srcPR,
g = lightness_transfer[hue][g];
b = saturation_transfer[hue][b];
gimp_hls_to_rgb (&r, &g, &b);
gimp_hls_to_rgb_int (&r, &g, &b);
d[RED_PIX] = r;
d[GREEN_PIX] = g;
@ -636,13 +636,13 @@ hue_saturation_update (HueSaturationDialog *hsd,
rgb[GREEN_PIX] = default_colors[i][GREEN_PIX];
rgb[BLUE_PIX] = default_colors[i][BLUE_PIX];
gimp_rgb_to_hls (rgb, rgb + 1, rgb + 2);
gimp_rgb_to_hls_int (rgb, rgb + 1, rgb + 2);
rgb[RED_PIX] = hue_transfer[i][rgb[RED_PIX]];
rgb[GREEN_PIX] = lightness_transfer[i][rgb[GREEN_PIX]];
rgb[BLUE_PIX] = saturation_transfer[i][rgb[BLUE_PIX]];
gimp_hls_to_rgb (rgb, rgb + 1, rgb + 2);
gimp_hls_to_rgb_int (rgb, rgb + 1, rgb + 2);
for (j = 0; j < DA_WIDTH; j++)
for (b = 0; b < 3; b++)

8
app/tools/hue_saturation.c
View File

@ -192,7 +192,7 @@ hue_saturation (PixelRegion *srcPR,
g = s[GREEN_PIX];
b = s[BLUE_PIX];
gimp_rgb_to_hls (&r, &g, &b);
gimp_rgb_to_hls_int (&r, &g, &b);
if (r < 43)
hue = 0;
@ -211,7 +211,7 @@ hue_saturation (PixelRegion *srcPR,
g = lightness_transfer[hue][g];
b = saturation_transfer[hue][b];
gimp_hls_to_rgb (&r, &g, &b);
gimp_hls_to_rgb_int (&r, &g, &b);
d[RED_PIX] = r;
d[GREEN_PIX] = g;
@ -636,13 +636,13 @@ hue_saturation_update (HueSaturationDialog *hsd,
rgb[GREEN_PIX] = default_colors[i][GREEN_PIX];
rgb[BLUE_PIX] = default_colors[i][BLUE_PIX];
gimp_rgb_to_hls (rgb, rgb + 1, rgb + 2);
gimp_rgb_to_hls_int (rgb, rgb + 1, rgb + 2);
rgb[RED_PIX] = hue_transfer[i][rgb[RED_PIX]];
rgb[GREEN_PIX] = lightness_transfer[i][rgb[GREEN_PIX]];
rgb[BLUE_PIX] = saturation_transfer[i][rgb[BLUE_PIX]];
gimp_hls_to_rgb (rgb, rgb + 1, rgb + 2);
gimp_hls_to_rgb_int (rgb, rgb + 1, rgb + 2);
for (j = 0; j < DA_WIDTH; j++)
for (b = 0; b < 3; b++)

30
libgimp/gimpcolorspace.c
View File

@ -26,9 +26,9 @@
*********************************/
void
gimp_rgb_to_hsv (gint *red,
gint *green,
gint *blue)
gimp_rgb_to_hsv_int (gint *red,
gint *green,
gint *blue)
{
gint r, g, b;
gdouble h, s, v;
@ -84,9 +84,9 @@ gimp_rgb_to_hsv (gint *red,
}
void
gimp_hsv_to_rgb (gint *hue,
gint *saturation,
gint *value)
gimp_hsv_to_rgb_int (gint *hue,
gint *saturation,
gint *value)
{
gdouble h, s, v;
gdouble f, p, q, t;
@ -150,9 +150,9 @@ gimp_hsv_to_rgb (gint *hue,
}
void
gimp_rgb_to_hls (gint *red,
gint *green,
gint *blue)
gimp_rgb_to_hls_int (gint *red,
gint *green,
gint *blue)
{
gint r, g, b;
gdouble h, l, s;
@ -211,9 +211,9 @@ gimp_rgb_to_hls (gint *red,
}
gint
gimp_rgb_to_l (gint red,
gint green,
gint blue)
gimp_rgb_to_l_int (gint red,
gint green,
gint blue)
{
gint min, max;
@ -255,9 +255,9 @@ gimp_hls_value (gdouble n1,
}
void
gimp_hls_to_rgb (gint *hue,
gint *lightness,
gint *saturation)
gimp_hls_to_rgb_int (gint *hue,
gint *lightness,
gint *saturation)
{
gdouble h, l, s;
gdouble m1, m2;

16
libgimp/gimpcolorspace.h
View File

@ -29,23 +29,29 @@ extern "C" {
/* Color conversion routines */
void gimp_rgb_to_hsv (gint *red /* returns hue */,
/* gint functions */
void gimp_rgb_to_hsv_int (gint *red /* returns hue */,
gint *green /* returns saturation */,
gint *blue /* returns value */);
void gimp_hsv_to_rgb (gint *hue /* returns red */,
void gimp_hsv_to_rgb_int (gint *hue /* returns red */,
gint *saturation /* returns green */,
gint *value /* returns blue */);
void gimp_rgb_to_hls (gint *red /* returns hue */,
void gimp_rgb_to_hls_int (gint *red /* returns hue */,
gint *green /* returns lightness */,
gint *blue /* returns saturation */);
gint gimp_rgb_to_l (gint red,
gint gimp_rgb_to_l_int (gint red,
gint green,
gint blue);
void gimp_hls_to_rgb (gint *hue /* returns red */,
void gimp_hls_to_rgb_int (gint *hue /* returns red */,
gint *lightness /* returns green */,
gint *saturation /* returns blue */);
/* gdouble functions */
void gimp_rgb_to_hsv_double (gdouble *red /* returns hue */,
gdouble *green /* returns saturation */,
gdouble *blue /* returns value */);

6
modules/colorsel_triangle.c
View File

@ -284,9 +284,9 @@ color_select_update_rgb_values (ColorSelect *csp)
csp->values[GREEN] = RINT (((gdouble) csp->values[SATURATION]) / 100.0 * 255);
csp->values[BLUE] = RINT (((gdouble) csp->values[VALUE]) / 100.0 * 255);
gimp_hsv_to_rgb (&(csp->values[RED]),
&(csp->values[GREEN]),
&(csp->values[BLUE]));
gimp_hsv_to_rgb_int (&(csp->values[RED]),
&(csp->values[GREEN]),
&(csp->values[BLUE]));
}
static void

10
plug-ins/common/CML_explorer.c
View File

@ -758,7 +758,7 @@ CML_main_function (gint preview_p)
gimp_pixel_rgn_get_pixel (&src_rgn, buffer,
x1 + (index * VALS.scale), y1);
for (i = 0; i < 3; i++) rgbi[i] = buffer[i];
gimp_rgb_to_hsv (rgbi, rgbi + 1, rgbi + 2);
gimp_rgb_to_hsv_int (rgbi, rgbi + 1, rgbi + 2);
hues[index] = (gdouble) rgbi[0] / (gdouble) 255;
sats[index] = (gdouble) rgbi[1] / (gdouble) 255;
vals[index] = (gdouble) rgbi[2] / (gdouble) 255;
@ -797,7 +797,7 @@ CML_main_function (gint preview_p)
v = b = CANNONIZE (VALS.val, vals[dx]);
if (! dest_is_gray)
gimp_hsv_to_rgb (&r, &g, &b);
gimp_hsv_to_rgb_int (&r, &g, &b);
/* render destination */
for (offset_y = 0;
(offset_y < VALS.scale) && (dy + offset_y < height_by_pixel);
@ -820,12 +820,12 @@ CML_main_function (gint preview_p)
b = rgbi[0];
else
{
gimp_rgb_to_hsv (rgbi, rgbi + 1, rgbi + 2);
gimp_rgb_to_hsv_int (rgbi, rgbi + 1, rgbi + 2);
r = (VALS.hue.function == CML_KEEP_VALUES) ? rgbi[0] : h;
g = (VALS.sat.function == CML_KEEP_VALUES) ? rgbi[1] : s;
b = (VALS.val.function == CML_KEEP_VALUES) ? rgbi[2] : v;
gimp_hsv_to_rgb (&r, &g, &b);
gimp_hsv_to_rgb_int (&r, &g, &b);
}
}
dest_offset = offset_y * dest_bpl + (dx * VALS.scale + offset_x) * dest_bpp;
@ -1969,7 +1969,7 @@ function_graph_new (GtkWidget *widget,
rgbi[0] = rgbi[1] = rgbi[2] = 127;
if ((0 <= channel_id) && (channel_id <= 2))
rgbi[channel_id] = CANNONIZE ((*param), ((gdouble) x / (gdouble) 255));
gimp_hsv_to_rgb (rgbi, rgbi+1, rgbi+2);
gimp_hsv_to_rgb_int (rgbi, rgbi+1, rgbi+2);
for (y = 0; y < 3; y++)
rgbc[y] = rgbi[y];
#endif

6
plug-ins/common/scatter_hsv.c
View File

@ -326,7 +326,7 @@ void scatter_hsv_scatter (guchar *r,
h = *r; s = *g; v = *b;
gimp_rgb_to_hsv (&h, &s, &v);
gimp_rgb_to_hsv_int (&h, &s, &v);
if (0 < VALS.hue_distance)
h = randomize_value (h, 0, 255, 1, VALS.hue_distance);
@ -337,11 +337,11 @@ void scatter_hsv_scatter (guchar *r,
h1 = h; s1 = s; v1 = v;
gimp_hsv_to_rgb (&h, &s, &v); /* don't believe ! */
gimp_hsv_to_rgb_int (&h, &s, &v); /* don't believe ! */
h2 = h; s2 = s; v2 = v;
gimp_rgb_to_hsv (&h2, &s2, &v2); /* h2 should be h1. But... */
gimp_rgb_to_hsv_int (&h2, &s2, &v2); /* h2 should be h1. But... */
if ((abs (h1 - h2) <= VALS.hue_distance)
&& (abs (s1 - s2) <= VALS.saturation_distance)

5
plug-ins/common/sparkle.c
View File

@ -1,4 +1,3 @@
/* Sparkle --- image filter plug-in for The Gimp image manipulation program
* Copyright (C) 1996 by John Beale; ported to Gimp by Michael J. Hammel;
* It has been optimized a little, bugfixed and modified by Martin Weber
@ -928,7 +927,7 @@ fspike (GimpPixelRgn *src_rgn,
r = 255 - color[0];
g = 255 - color[1];
b = 255 - color[2];
gimp_rgb_to_hsv (&r, &g, &b);
gimp_rgb_to_hsv_int (&r, &g, &b);
r+= (svals.random_hue * ((gdouble) rand() / (gdouble) RAND_MAX - 0.5))*255;
if (r >= 255)
r -= 255;
@ -937,7 +936,7 @@ fspike (GimpPixelRgn *src_rgn,
b+= (svals.random_saturation * (2.0 * (gdouble) rand() /
(gdouble) RAND_MAX - 1.0))*255;
if (b > 255) b = 255;
gimp_hsv_to_rgb (&r, &g, &b);
gimp_hsv_to_rgb_int (&r, &g, &b);
color[0] = 255 - r;
color[1] = 255 - g;
color[2] = 255 - b;

4
plug-ins/common/vinvert.c
View File

@ -190,9 +190,9 @@ vinvert_render_row (const guchar *src_data,
v2 = src_data[col*bytes +1];
v3 = src_data[col*bytes +2];
gimp_rgb_to_hsv (&v1, &v2, &v3);
gimp_rgb_to_hsv_int (&v1, &v2, &v3);
v3 = 255-v3;
gimp_hsv_to_rgb (&v1, &v2, &v3);
gimp_hsv_to_rgb_int (&v1, &v2, &v3);
dest_data[col*bytes ] = v1;
dest_data[col*bytes +1] = v2;

9
plug-ins/gflare/gflare.c
View File

@ -1949,9 +1949,9 @@ calc_sample_one_gradient ()
g = gradient[j*4+1];
b = gradient[j*4+2];
gimp_rgb_to_hsv (&r, &g, &b);
gimp_rgb_to_hsv_int (&r, &g, &b);
r = (r + hue) % 256;
gimp_hsv_to_rgb (&r, &g, &b);
gimp_hsv_to_rgb_int (&r, &g, &b);
gradient[j*4] = r;
gradient[j*4+1] = g;
@ -4555,7 +4555,10 @@ preview_handle_idle (Preview *preview)
*/
void
preview_rgba_to_rgb (guchar *dest, gint x, gint y, guchar *src)
preview_rgba_to_rgb (guchar *dest,
gint x,
gint y,
guchar *src)
{
gint src_a;
gint check;