mirror of https://github.com/GNOME/gimp.git
app/actions/gradient-editor-commands.c irrelevant coding style and spacing
2004-10-25 Michael Natterer <mitch@gimp.org> * app/actions/gradient-editor-commands.c * app/display/gimpdisplayshell-preview.c: irrelevant coding style and spacing cleanups. * app/widgets/gimpimageeditor.c: removed utility function gimp_image_editor_context_changed() and connect gimp_image_editor_set_image() directly using g_signal_connect_swapped().
This commit is contained in:
Michael Natterer
Michael Natterer
parent
537890aacb
commit
e88a663631
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2004-10-25 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/actions/gradient-editor-commands.c
|
||||
* app/display/gimpdisplayshell-preview.c: irrelevant coding style
|
||||
and spacing cleanups.
|
||||
|
||||
* app/widgets/gimpimageeditor.c: removed utility function
|
||||
gimp_image_editor_context_changed() and connect
|
||||
gimp_image_editor_set_image() directly using
|
||||
g_signal_connect_swapped().
|
||||
|
||||
2004-10-25 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* plug-ins/imagemap/imap_circle.c
|
||||
|
|
@ -25,7 +36,7 @@
|
|||
2004-10-25 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* tools/pdbgen/enumcode.pl
|
||||
* libgimp/Makefile.am: register all enums in libgimp/gimenums.h
|
||||
* libgimp/Makefile.am: register all enums in libgimp/gimpenums.h
|
||||
with the type system.
|
||||
|
||||
* libgimp/gimpenums.h: regenerated.
|
||||
|
|
|
|||
|
|
@ -714,7 +714,7 @@ gradient_editor_save_selection (GimpGradientEditor *editor)
|
|||
}
|
||||
|
||||
static void
|
||||
gradient_editor_replace_selection (GimpGradientEditor *editor,
|
||||
gradient_editor_replace_selection (GimpGradientEditor *editor,
|
||||
GimpGradientSegment *replace_seg)
|
||||
{
|
||||
GimpGradient *gradient;
|
||||
|
|
@ -766,9 +766,7 @@ gradient_editor_split_uniform_response (GtkWidget *widget,
|
|||
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
GimpGradient *gradient;
|
||||
|
||||
gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
|
||||
GimpGradient *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
|
||||
|
||||
gimp_gradient_segment_range_split_uniform (gradient,
|
||||
editor->control_sel_l,
|
||||
|
|
@ -789,9 +787,7 @@ gradient_editor_replicate_response (GtkWidget *widget,
|
|||
|
||||
if (response_id == GTK_RESPONSE_OK)
|
||||
{
|
||||
GimpGradient *gradient;
|
||||
|
||||
gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
|
||||
GimpGradient *gradient = GIMP_GRADIENT (GIMP_DATA_EDITOR (editor)->data);
|
||||
|
||||
gimp_gradient_segment_range_replicate (gradient,
|
||||
editor->control_sel_l,
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ void
|
|||
gimp_display_shell_preview_transform (GimpDisplayShell *shell)
|
||||
{
|
||||
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
|
||||
|
||||
|
||||
if (gimp_display_shell_get_show_transform (shell))
|
||||
{
|
||||
GimpTool *tool;
|
||||
|
|
@ -101,7 +101,7 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell)
|
|||
|
||||
if (! tr_tool->use_grid)
|
||||
return;
|
||||
|
||||
|
||||
z1 = ((tr_tool->tx2 - tr_tool->tx1) * (tr_tool->ty4 - tr_tool->ty1) -
|
||||
(tr_tool->tx4 - tr_tool->tx1) * (tr_tool->ty2 - tr_tool->ty1));
|
||||
z2 = ((tr_tool->tx4 - tr_tool->tx1) * (tr_tool->ty3 - tr_tool->ty1) -
|
||||
|
|
@ -114,13 +114,13 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell)
|
|||
/* only draw convex polygons */
|
||||
|
||||
if ((z1 * z2 > 0) && (z3 * z4 > 0))
|
||||
{
|
||||
{
|
||||
gdouble dx [4], dy [4];
|
||||
gint x [4], y [4];
|
||||
gfloat u [4], v [4];
|
||||
GimpChannel *mask;
|
||||
gint mask_x1, mask_y1,
|
||||
mask_x2, mask_y2;
|
||||
gint mask_x1, mask_y1;
|
||||
gint mask_x2, mask_y2;
|
||||
gint mask_offx, mask_offy;
|
||||
gint i;
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ gimp_display_shell_draw_quad (GimpDrawable *texture,
|
|||
gint *left, *right;
|
||||
gfloat dul, dvl, dur, dvr; /* left and right texture coord deltas */
|
||||
gfloat u_l, v_l, u_r, v_r; /* left and right texture coord pairs */
|
||||
|
||||
|
||||
if (! GIMP_IS_DRAWABLE (texture) ||
|
||||
! GDK_IS_DRAWABLE (dest))
|
||||
return;
|
||||
|
|
@ -214,7 +214,7 @@ gimp_display_shell_draw_quad (GimpDrawable *texture,
|
|||
}
|
||||
if (! (in_window_x && in_window_y))
|
||||
return;
|
||||
|
||||
|
||||
in_window_x = in_window_y = FALSE;
|
||||
for (j = 0; j < 4; j++)
|
||||
{
|
||||
|
|
@ -240,16 +240,16 @@ gimp_display_shell_draw_quad (GimpDrawable *texture,
|
|||
{
|
||||
gint tmp;
|
||||
gfloat ftmp;
|
||||
|
||||
|
||||
tmp = y [k]; y [k] = y [j]; y [j] = tmp;
|
||||
tmp = x [k]; x [k] = x [j]; x [j] = tmp;
|
||||
ftmp = u [k]; u [k] = u [j]; u [j] = ftmp;
|
||||
ftmp = v [k]; v [k] = v [j]; v [j] = ftmp;
|
||||
}
|
||||
|
||||
|
||||
if (y [3] == y [0])
|
||||
return;
|
||||
|
||||
|
||||
l_edge = g_malloc ((y [3] - y [0]) * sizeof (gint));
|
||||
r_edge = g_malloc ((y [3] - y [0]) * sizeof (gint));
|
||||
|
||||
|
|
@ -319,9 +319,9 @@ gimp_display_shell_draw_quad (GimpDrawable *texture,
|
|||
* |__--- v2
|
||||
* v3
|
||||
*/
|
||||
|
||||
|
||||
QUAD_TRACE_L_EDGE (0, 3);
|
||||
|
||||
|
||||
QUAD_TRACE_R_EDGE (0, 1);
|
||||
QUAD_DRAW_SECTION (0, 1); /* top section */
|
||||
|
||||
|
|
@ -342,16 +342,16 @@ gimp_display_shell_draw_quad (GimpDrawable *texture,
|
|||
* ---_/
|
||||
* v3
|
||||
*/
|
||||
|
||||
|
||||
QUAD_TRACE_L_EDGE (0, 2);
|
||||
|
||||
|
||||
QUAD_TRACE_R_EDGE (0, 1);
|
||||
QUAD_DRAW_SECTION (0, 1); /* top section */
|
||||
|
||||
|
||||
QUAD_TRACE_R_EDGE (1, 3);
|
||||
|
||||
|
||||
QUAD_DRAW_SECTION (1, 2); /* middle section */
|
||||
|
||||
|
||||
QUAD_TRACE_L_EDGE (2, 3);
|
||||
QUAD_DRAW_SECTION (2, 3); /* bottom section */
|
||||
}
|
||||
|
|
@ -359,7 +359,7 @@ gimp_display_shell_draw_quad (GimpDrawable *texture,
|
|||
#undef QUAD_TRACE_L_EDGE
|
||||
#undef QUAD_TRACE_R_EDGE
|
||||
#undef QUAD_DRAW_SECTION
|
||||
|
||||
|
||||
g_object_unref (row);
|
||||
g_free (l_edge);
|
||||
g_free (r_edge);
|
||||
|
|
@ -389,7 +389,7 @@ gimp_display_shell_draw_quad_row (GimpDrawable *texture,
|
|||
|
||||
if (! (x2 - x1))
|
||||
return;
|
||||
|
||||
|
||||
g_return_if_fail (GIMP_IS_DRAWABLE (texture));
|
||||
g_return_if_fail (GDK_IS_DRAWABLE (dest));
|
||||
g_return_if_fail (GDK_IS_PIXBUF (row));
|
||||
|
|
@ -401,12 +401,12 @@ gimp_display_shell_draw_quad_row (GimpDrawable *texture,
|
|||
bytes = gdk_pixbuf_get_n_channels (row);
|
||||
pptr = gdk_pixbuf_get_pixels (row);
|
||||
tiles = gimp_drawable_data (texture);
|
||||
|
||||
|
||||
if (x1 > x2)
|
||||
{
|
||||
gint tmp;
|
||||
gfloat ftmp;
|
||||
|
||||
|
||||
tmp = x2; x2 = x1; x1 = tmp;
|
||||
ftmp = u2; u2 = u1; u1 = ftmp;
|
||||
ftmp = v2; v2 = v1; v1 = ftmp;
|
||||
|
|
@ -431,20 +431,20 @@ gimp_display_shell_draw_quad_row (GimpDrawable *texture,
|
|||
else if (x2 > gdk_pixbuf_get_width (row))
|
||||
x2 = gdk_pixbuf_get_width (row);
|
||||
|
||||
|
||||
|
||||
dx = x2 - x1;
|
||||
|
||||
switch (gimp_drawable_type (texture))
|
||||
{
|
||||
case GIMP_INDEXED_IMAGE:
|
||||
cmap = gimp_drawable_cmap (texture);
|
||||
|
||||
|
||||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pixel);
|
||||
|
||||
offset = pixel [0] + pixel [0] + pixel [0];
|
||||
|
||||
|
||||
*pptr++ = cmap [offset];
|
||||
*pptr++ = cmap [offset + 1];
|
||||
*pptr++ = cmap [offset + 2];
|
||||
|
|
@ -456,13 +456,13 @@ gimp_display_shell_draw_quad_row (GimpDrawable *texture,
|
|||
|
||||
case GIMP_INDEXEDA_IMAGE:
|
||||
cmap = gimp_drawable_cmap (texture);
|
||||
|
||||
|
||||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pixel);
|
||||
|
||||
offset = pixel [0] + pixel [0] + pixel [0];
|
||||
|
||||
|
||||
*pptr++ = cmap [offset];
|
||||
*pptr++ = cmap [offset + 1];
|
||||
*pptr++ = cmap [offset + 2];
|
||||
|
|
@ -491,19 +491,19 @@ gimp_display_shell_draw_quad_row (GimpDrawable *texture,
|
|||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pixel);
|
||||
|
||||
|
||||
*pptr++ = pixel [0];
|
||||
*pptr++ = pixel [0];
|
||||
*pptr++ = pixel [0];
|
||||
*pptr++ = pixel [1];
|
||||
|
||||
|
||||
u += du;
|
||||
v += dv;
|
||||
}
|
||||
break;
|
||||
|
||||
case GIMP_RGB_IMAGE:
|
||||
case GIMP_RGBA_IMAGE:
|
||||
case GIMP_RGBA_IMAGE:
|
||||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pptr);
|
||||
|
|
@ -550,7 +550,7 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
|
||||
if (! (x2 - x1))
|
||||
return;
|
||||
|
||||
|
||||
g_return_if_fail (GIMP_IS_DRAWABLE (texture));
|
||||
g_return_if_fail (GIMP_IS_CHANNEL (mask));
|
||||
g_return_if_fail (GDK_IS_DRAWABLE (dest));
|
||||
|
|
@ -563,12 +563,12 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
pptr = gdk_pixbuf_get_pixels (row);
|
||||
tiles = gimp_drawable_data (texture);
|
||||
masktiles = gimp_drawable_data (GIMP_DRAWABLE (mask));
|
||||
|
||||
|
||||
if (x1 > x2)
|
||||
{
|
||||
gint tmp;
|
||||
gfloat ftmp;
|
||||
|
||||
|
||||
tmp = x2; x2 = x1; x1 = tmp;
|
||||
ftmp = u2; u2 = u1; u1 = ftmp;
|
||||
ftmp = v2; v2 = v1; v1 = ftmp;
|
||||
|
|
@ -601,14 +601,14 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
{
|
||||
case GIMP_INDEXED_IMAGE:
|
||||
cmap = gimp_drawable_cmap (texture);
|
||||
|
||||
|
||||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pixel);
|
||||
read_pixel_data_1 (masktiles, (gint) mu, (gint) mv, pptr + alpha);
|
||||
|
||||
offset = pixel [0] + pixel [0] + pixel [0];
|
||||
|
||||
|
||||
*pptr++ = cmap [offset];
|
||||
*pptr++ = cmap [offset + 1];
|
||||
*pptr++ = cmap [offset + 2];
|
||||
|
|
@ -623,14 +623,14 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
|
||||
case GIMP_INDEXEDA_IMAGE:
|
||||
cmap = gimp_drawable_cmap (texture);
|
||||
|
||||
|
||||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pixel);
|
||||
read_pixel_data_1 (masktiles, (gint) mu, (gint) mv, &maskval);
|
||||
|
||||
offset = pixel [0] + pixel [0] + pixel [0];
|
||||
|
||||
|
||||
*pptr++ = cmap [offset];
|
||||
*pptr++ = cmap [offset + 1];
|
||||
*pptr++ = cmap [offset + 2];
|
||||
|
|
@ -666,12 +666,12 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pixel);
|
||||
read_pixel_data_1 (masktiles, (gint) mu, (gint) mv, &maskval);
|
||||
|
||||
|
||||
*pptr++ = pixel [0];
|
||||
*pptr++ = pixel [0];
|
||||
*pptr++ = pixel [0];
|
||||
*pptr++ = ((gint) maskval * pixel [1]) >> 8;
|
||||
|
||||
|
||||
u += du;
|
||||
v += dv;
|
||||
mu += du;
|
||||
|
|
@ -684,7 +684,7 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pptr);
|
||||
read_pixel_data_1 (masktiles, (gint) mu, (gint) mv, pptr + alpha);
|
||||
|
||||
|
||||
pptr += bytes;
|
||||
u += du;
|
||||
v += dv;
|
||||
|
|
@ -693,7 +693,7 @@ gimp_display_shell_draw_quad_row_mask (GimpDrawable *texture,
|
|||
}
|
||||
break;
|
||||
|
||||
case GIMP_RGBA_IMAGE:
|
||||
case GIMP_RGBA_IMAGE:
|
||||
while (dx --)
|
||||
{
|
||||
read_pixel_data_1 (tiles, (gint) u, (gint) v, pptr);
|
||||
|
|
@ -731,15 +731,15 @@ gimp_display_shell_trace_quad_edge (gint *dest,
|
|||
gint b;
|
||||
gint *dptr;
|
||||
|
||||
if (dy == 0)
|
||||
if (dy == 0)
|
||||
return;
|
||||
|
||||
|
||||
g_return_if_fail (dest != NULL);
|
||||
|
||||
|
||||
b = 0;
|
||||
errorterm = 0;
|
||||
dptr = dest;
|
||||
|
||||
|
||||
if (x2 < x1)
|
||||
{
|
||||
dx = x1 - x2;
|
||||
|
|
@ -758,13 +758,13 @@ gimp_display_shell_trace_quad_edge (gint *dest,
|
|||
{
|
||||
*dptr = x1;
|
||||
errorterm += dx;
|
||||
|
||||
|
||||
while (errorterm > dy)
|
||||
{
|
||||
x1 += xdir;
|
||||
errorterm -= dy;
|
||||
}
|
||||
|
||||
|
||||
dptr ++;
|
||||
}
|
||||
}
|
||||
|
|
@ -775,13 +775,13 @@ gimp_display_shell_trace_quad_edge (gint *dest,
|
|||
{
|
||||
*dptr = x1;
|
||||
errorterm += dx;
|
||||
|
||||
|
||||
if (errorterm > dy)
|
||||
{
|
||||
x1 += xdir;
|
||||
errorterm -= dy;
|
||||
}
|
||||
|
||||
|
||||
dptr ++;
|
||||
}
|
||||
}
|
||||
|
|
@ -791,7 +791,7 @@ gimp_display_shell_trace_quad_edge (gint *dest,
|
|||
while (b --)
|
||||
{
|
||||
*dptr = x1;
|
||||
|
||||
|
||||
dptr ++;
|
||||
}
|
||||
}
|
||||
|
|
@ -802,7 +802,7 @@ gimp_display_shell_trace_quad_edge (gint *dest,
|
|||
{
|
||||
*dptr = x1;
|
||||
x1 += xdir;
|
||||
|
||||
|
||||
dptr ++;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,14 +109,6 @@ gimp_image_editor_docked_iface_init (GimpDockedInterface *docked_iface)
|
|||
docked_iface->set_context = gimp_image_editor_set_context;
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_image_editor_context_changed (GimpContext *context,
|
||||
GimpImage *gimage,
|
||||
GimpImageEditor *editor)
|
||||
{
|
||||
gimp_image_editor_set_image (editor, gimage);
|
||||
}
|
||||
|
||||
static void
|
||||
gimp_image_editor_set_context (GimpDocked *docked,
|
||||
GimpContext *context)
|
||||
|
|
@ -125,22 +117,16 @@ gimp_image_editor_set_context (GimpDocked *docked,
|
|||
GimpImage *gimage = NULL;
|
||||
|
||||
if (editor->context)
|
||||
{
|
||||
g_signal_handlers_disconnect_by_func (editor->context,
|
||||
gimp_image_editor_context_changed,
|
||||
editor);
|
||||
}
|
||||
g_signal_handlers_disconnect_by_func (editor->context,
|
||||
gimp_image_editor_set_image,
|
||||
editor);
|
||||
|
||||
editor->context = context;
|
||||
|
||||
if (context)
|
||||
{
|
||||
g_signal_connect (context, "image_changed",
|
||||
G_CALLBACK (gimp_image_editor_context_changed),
|
||||
editor);
|
||||
|
||||
gimage = gimp_context_get_image (context);
|
||||
}
|
||||
g_signal_connect_swapped (context, "image_changed",
|
||||
G_CALLBACK (gimp_image_editor_set_image),
|
||||
editor);
|
||||
|
||||
gimp_image_editor_set_image (editor, gimage);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue