dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't just skip guides at the image edges but any guide which is at a

Browse source 
2004-03-29  Michael Natterer  <mitch@gimp.org>

	* plug-ins/common/guillotine.c (guillotine): Don't just skip
	guides at the image edges but any guide which is at a position we
	already remembered. Should catch all instances of bug #138312 this
	time.
This commit is contained in:
Michael Natterer 2004-03-29 09:27:30 +00:00 committed by Michael Natterer
parent c8a387e09c
commit f1de2e7d43
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-03-29 Michael Natterer <mitch@gimp.org>
* plug-ins/common/guillotine.c (guillotine): Don't just skip
guides at the image edges but any guide which is at a position we
already remembered. Should catch all instances of bug #138312 this
time.
2004-03-28 Sven Neumann <sven@gimp.org>
* plug-ins/ifscompose/ifscompose.c: applied patch from David Necas

38
plug-ins/common/guillotine.c
View file

@ -95,14 +95,13 @@ run (const gchar *name,
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
*nreturn_vals = 1;
*return_vals = values;
*return_vals = values;
values[0].type = GIMP_PDB_STATUS;
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status;
INIT_I18N();
/* Get the specified drawable */
image_ID = param[1].data.d_image;
if (status == GIMP_PDB_SUCCESS)
@ -148,33 +147,32 @@ guillotine (gint32 image_ID)
{
gint position = gimp_image_get_guide_position (image_ID, guide);
if (position == 0)
continue;
switch (gimp_image_get_guide_orientation (image_ID, guide))
{
case GIMP_ORIENTATION_HORIZONTAL:
if (position == image_height)
continue;
hguides = g_list_insert_sorted (hguides, GINT_TO_POINTER (position),
guide_sort_func);
if (! g_list_find (hguides, GINT_TO_POINTER (position)))
{
hguides = g_list_insert_sorted (hguides,
GINT_TO_POINTER (position),
guide_sort_func);
guides_found = TRUE;
}
break;
case GIMP_ORIENTATION_VERTICAL:
if (position == image_width)
continue;
vguides = g_list_insert_sorted (vguides, GINT_TO_POINTER (position),
guide_sort_func);
if (! g_list_find (vguides, GINT_TO_POINTER (position)))
{
vguides = g_list_insert_sorted (vguides,
GINT_TO_POINTER (position),
guide_sort_func);
guides_found = TRUE;
}
break;
case GIMP_ORIENTATION_UNKNOWN:
g_assert_not_reached ();
break;
}
guides_found = TRUE;
}
if (guides_found)
@ -213,9 +211,7 @@ guillotine (gint32 image_ID)
GPOINTER_TO_INT (hg->data));
/* show the rough coordinates of the image in the title */
new_filename = g_strdup_printf ("%s-(%i,%i)",
filename,
x, y);
new_filename = g_strdup_printf ("%s-(%i,%i)", filename, x, y);
gimp_image_set_filename (new_image, new_filename);
g_free (new_filename);