mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-21 03:52:33 +00:00
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:
parent
99e7fe032f
commit
9d2cc5f82a
|
@ -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>
|
||||
|
||||
* plug-ins/film/film.c: moved the "Reset" button to the "Advanced"
|
||||
|
|
|
@ -42,8 +42,8 @@ gimp_image_pick_color (GimpImage *gimage,
|
|||
gint y,
|
||||
gboolean sample_average,
|
||||
gdouble average_radius,
|
||||
GimpRGB *color,
|
||||
GimpImageType *sample_type,
|
||||
GimpRGB *color,
|
||||
gint *color_index)
|
||||
{
|
||||
GimpRGB rgb_color;
|
||||
|
@ -106,6 +106,7 @@ gimp_image_pick_color (GimpImage *gimage,
|
|||
color_avg[RED_PIX] += tmp_col[RED_PIX];
|
||||
color_avg[GREEN_PIX] += tmp_col[GREEN_PIX];
|
||||
color_avg[BLUE_PIX] += tmp_col[BLUE_PIX];
|
||||
|
||||
if (has_alpha)
|
||||
color_avg[ALPHA_PIX] += tmp_col[ALPHA_PIX];
|
||||
|
||||
|
@ -142,12 +143,12 @@ gimp_image_pick_color (GimpImage *gimage,
|
|||
|
||||
g_free (col);
|
||||
|
||||
if (color)
|
||||
*color = rgb_color;
|
||||
|
||||
if (sample_type)
|
||||
*sample_type = my_sample_type;
|
||||
|
||||
if (color)
|
||||
*color = rgb_color;
|
||||
|
||||
if (color_index)
|
||||
*color_index = my_color_index;
|
||||
|
||||
|
|
|
@ -27,8 +27,8 @@ gboolean gimp_image_pick_color (GimpImage *gimage,
|
|||
gint y,
|
||||
gboolean sample_average,
|
||||
gdouble average_radius,
|
||||
GimpRGB *color,
|
||||
GimpImageType *sample_type,
|
||||
GimpRGB *color,
|
||||
gint *color_index);
|
||||
|
||||
|
||||
|
|
|
@ -693,8 +693,8 @@ gimp_paint_tool_sample_color (GimpDrawable *drawable,
|
|||
x, y,
|
||||
options->sample_average,
|
||||
options->average_radius,
|
||||
&color,
|
||||
NULL,
|
||||
&color,
|
||||
NULL))
|
||||
{
|
||||
if ((state & GDK_CONTROL_MASK))
|
||||
|
|
|
@ -327,8 +327,8 @@ gimp_color_picker_tool_pick (GimpColorTool *tool,
|
|||
x, y,
|
||||
options->sample_average,
|
||||
options->average_radius,
|
||||
&color,
|
||||
&sample_type,
|
||||
&color,
|
||||
&color_index);
|
||||
|
||||
if (success)
|
||||
|
|
|
@ -693,8 +693,8 @@ gimp_paint_tool_sample_color (GimpDrawable *drawable,
|
|||
x, y,
|
||||
options->sample_average,
|
||||
options->average_radius,
|
||||
&color,
|
||||
NULL,
|
||||
&color,
|
||||
NULL))
|
||||
{
|
||||
if ((state & GDK_CONTROL_MASK))
|
||||
|
|
Loading…
Reference in a new issue