Commit 3e56a071 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

don't add documents w/o a name to the list. Fixes bug #159510.

2004-11-26  Sven Neumann  <sven@gimp.org>

	* app/core/gimpdocumentlist.c (gimp_document_list_deserialize):
	don't add documents w/o a name to the list. Fixes bug #159510.

	* app/core/gimpdrawable.c (gimp_drawable_resize): extended the
	check to take the offsets into account as well.
parent 03eae140
2004-11-26 Sven Neumann <sven@gimp.org>
* app/core/gimpdocumentlist.c (gimp_document_list_deserialize):
don't add documents w/o a name to the list. Fixes bug #159510.
* app/core/gimpdrawable.c (gimp_drawable_resize): extended the
check to take the offsets into account as well.
2004-11-25 Manish Singh <yosh@gimp.org>
* plug-ins/common/dog.c: Add the temporary layers to the image, so
......
......@@ -140,8 +140,7 @@ gimp_document_list_deserialize (GimpConfig *config,
token = G_TOKEN_RIGHT_PAREN;
if (scanner->value.v_symbol == document_symbol)
{
gchar *uri;
GimpImagefile *imagefile;
gchar *uri = NULL;
if (! gimp_scanner_parse_string (scanner, &uri))
{
......@@ -149,14 +148,19 @@ gimp_document_list_deserialize (GimpConfig *config,
break;
}
imagefile = gimp_imagefile_new (document_list->gimp, uri);
if (uri)
{
GimpImagefile *imagefile;
imagefile = gimp_imagefile_new (document_list->gimp, uri);
g_free (uri);
g_free (uri);
gimp_container_add (GIMP_CONTAINER (document_list),
GIMP_OBJECT (imagefile));
gimp_container_add (GIMP_CONTAINER (document_list),
GIMP_OBJECT (imagefile));
g_object_unref (imagefile);
g_object_unref (imagefile);
}
}
break;
......
......@@ -450,7 +450,10 @@ gimp_drawable_resize (GimpItem *item,
gint copy_width, copy_height;
/* if the size doesn't change, this is a nop */
if (item->width == new_width && item->height == new_height)
if (new_width == item->width &&
new_height == item->height &&
offset_x == 0 &&
offset_y == 0)
return;
new_offset_x = item->offset_x - offset_x;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment