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

don't attempt to reorder to a position >= container->num_children. 

2006-06-21  Sven Neumann  <sven@gimp.org>

	* app/tools/gimp-tools.c (gimp_tools_restore): don't attempt to
	reorder to a position >= container->num_children.
This commit is contained in:
Sven Neumann 2006-06-21 21:59:03 +00:00 committed by Sven Neumann
parent 018618d31e
commit 4a265d02cd
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-06-21 Sven Neumann <sven@gimp.org>
* app/tools/gimp-tools.c (gimp_tools_restore): don't attempt to
reorder to a position >= container->num_children.
2006-06-21 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/tools/gimprectangleselecttool.c: Always use crosshair cursor

4
app/tools/gimp-tools.c
View File

@ -241,6 +241,7 @@ gimp_tools_restore (Gimp *gimp)
if (gimp_config_deserialize_file (GIMP_CONFIG (gimp_list), filename,
NULL, NULL))
{
gint n = gimp_container_num_children (gimp->tool_info_list);
gint i;
gimp_list_reverse (GIMP_LIST (gimp_list));
@ -263,7 +264,8 @@ gimp_tools_restore (Gimp *gimp)
"visible", GIMP_TOOL_INFO (list->data)->visible,
NULL);
gimp_container_reorder (gimp->tool_info_list, object, i);
gimp_container_reorder (gimp->tool_info_list,
object, MIN (i, n - 1));
}
}
}

9
plug-ins/common/colormap-remap.c
View File

@ -28,10 +28,10 @@
*
*/
#include "config.h"
#include <string.h>
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
@ -119,7 +119,7 @@ query (void)
"without visually changing the image.",
"Mukund Sivaraman <muks@mukund.org>",
"Mukund Sivaraman <muks@mukund.org>",
"14th June 2006",
"June 2006",
N_("_Swap Colors"),
"INDEXED*",
GIMP_PLUGIN,
@ -266,13 +266,14 @@ remap (gint32 image_ID,
gint num_colors,
guchar *map)
{
guchar *cmap, *new_cmap;
guchar *cmap;
guchar *new_cmap;
guchar *new_cmap_i;
gint ncols;
gint num_layers;
gint32 *layers;
gint i, j, k;
glong pixels = 0;
glong pixels = 0;
glong processed = 0;
guchar pixel_map[256];
gboolean valid[256];