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

reordered arguments. 

2003-06-04  Sven Neumann  <sven@gimp.org>

	* app/core/gimpimage-pick-color.[ch]: reordered arguments.

	* app/tools/gimpcolorpickertool.c
	* app/tools/gimppainttool.c: changed accordingly.
This commit is contained in:
Sven Neumann 2003-06-04 16:42:46 +00:00 committed by Sven Neumann
parent 99e7fe032f
commit 9d2cc5f82a
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-06-04 Sven Neumann <sven@gimp.org>
* app/core/gimpimage-pick-color.[ch]: reordered arguments.
* app/tools/gimpcolorpickertool.c
* app/tools/gimppainttool.c: changed accordingly.
2003-06-04 Michael Natterer <mitch@gimp.org> 2003-06-04 Michael Natterer <mitch@gimp.org>
* plug-ins/film/film.c: moved the "Reset" button to the "Advanced" * plug-ins/film/film.c: moved the "Reset" button to the "Advanced"

9
app/core/gimpimage-pick-color.c
View File

@ -42,8 +42,8 @@ gimp_image_pick_color (GimpImage *gimage,
gint y, gint y,
gboolean sample_average, gboolean sample_average,
gdouble average_radius, gdouble average_radius,
GimpRGB *color,
GimpImageType *sample_type, GimpImageType *sample_type,
GimpRGB *color,
gint *color_index) gint *color_index)
{ {
GimpRGB rgb_color; GimpRGB rgb_color;
@ -106,6 +106,7 @@ gimp_image_pick_color (GimpImage *gimage,
color_avg[RED_PIX] += tmp_col[RED_PIX]; color_avg[RED_PIX] += tmp_col[RED_PIX];
color_avg[GREEN_PIX] += tmp_col[GREEN_PIX]; color_avg[GREEN_PIX] += tmp_col[GREEN_PIX];
color_avg[BLUE_PIX] += tmp_col[BLUE_PIX]; color_avg[BLUE_PIX] += tmp_col[BLUE_PIX];
if (has_alpha) if (has_alpha)
color_avg[ALPHA_PIX] += tmp_col[ALPHA_PIX]; color_avg[ALPHA_PIX] += tmp_col[ALPHA_PIX];
@ -142,12 +143,12 @@ gimp_image_pick_color (GimpImage *gimage,
g_free (col); g_free (col);
if (color)
*color = rgb_color;
if (sample_type) if (sample_type)
*sample_type = my_sample_type; *sample_type = my_sample_type;
if (color)
*color = rgb_color;
if (color_index) if (color_index)
*color_index = my_color_index; *color_index = my_color_index;

2
app/core/gimpimage-pick-color.h
View File

@ -27,8 +27,8 @@ gboolean gimp_image_pick_color (GimpImage *gimage,
gint y, gint y,
gboolean sample_average, gboolean sample_average,
gdouble average_radius, gdouble average_radius,
GimpRGB *color,
GimpImageType *sample_type, GimpImageType *sample_type,
GimpRGB *color,
gint *color_index); gint *color_index);

2
app/tools/gimpbrushtool.c
View File

@ -693,8 +693,8 @@ gimp_paint_tool_sample_color (GimpDrawable *drawable,
x, y, x, y,
options->sample_average, options->sample_average,
options->average_radius, options->average_radius,
&color,
NULL, NULL,
&color,
NULL)) NULL))
{ {
if ((state & GDK_CONTROL_MASK)) if ((state & GDK_CONTROL_MASK))

2
app/tools/gimpcolorpickertool.c
View File

@ -327,8 +327,8 @@ gimp_color_picker_tool_pick (GimpColorTool *tool,
x, y, x, y,
options->sample_average, options->sample_average,
options->average_radius, options->average_radius,
&color,
&sample_type, &sample_type,
&color,
&color_index); &color_index);
if (success) if (success)

2
app/tools/gimppainttool.c
View File

@ -693,8 +693,8 @@ gimp_paint_tool_sample_color (GimpDrawable *drawable,
x, y, x, y,
options->sample_average, options->sample_average,
options->average_radius, options->average_radius,
&color,
NULL, NULL,
&color,
NULL)) NULL))
{ {
if ((state & GDK_CONTROL_MASK)) if ((state & GDK_CONTROL_MASK))