added "GimpTattoo tattoo_state" to the XcfInfo struct.

2003-12-06  Michael Natterer  <mitch@gimp.org>

	* app/xcf/xcf-private.h: added "GimpTattoo tattoo_state" to the
	XcfInfo struct.

	* app/xcf/xcf.c (xcf_load_invoker): initialize it to 0.

	* app/xcf/xcf-load.c (xcf_load_image_props): remember PROP_TATTOO
	in info->tattoo_state instead of setting it directly in the
	GimpImage struct.

	(xcf_load_image): set the remembered tattoo_state after all items
	are created.

	(Fixes the regression that "open -> don't modify -> save" didn't
	result in 100% identical XCF files).
This commit is contained in:
Michael Natterer 2003-12-06 15:53:26 +00:00 committed by Michael Natterer
parent 0560161fa5
commit 26a68a58d9
4 changed files with 23 additions and 1 deletions

View File

@ -1,3 +1,20 @@
2003-12-06 Michael Natterer <mitch@gimp.org>
* app/xcf/xcf-private.h: added "GimpTattoo tattoo_state" to the
XcfInfo struct.
* app/xcf/xcf.c (xcf_load_invoker): initialize it to 0.
* app/xcf/xcf-load.c (xcf_load_image_props): remember PROP_TATTOO
in info->tattoo_state instead of setting it directly in the
GimpImage struct.
(xcf_load_image): set the remembered tattoo_state after all items
are created.
(Fixes the regression that "open -> don't modify -> save" didn't
result in 100% identical XCF files).
2003-12-05 Manish Singh <yosh@gimp.org>
* plug-ins/common/gif.c: always compare using unsigned chars for 7bit

View File

@ -243,6 +243,9 @@ xcf_load_image (Gimp *gimp,
gimp_image_set_filename (gimage, info->filename);
if (info->tattoo_state > 0)
gimp_image_set_tattoo_state (gimage, info->tattoo_state);
return gimage;
error:
@ -391,7 +394,7 @@ xcf_load_image_props (XcfInfo *info,
case PROP_TATTOO:
{
info->cp += xcf_read_int32 (info->fp, &gimage->tattoo_state, 1);
info->cp += xcf_read_int32 (info->fp, &info->tattoo_state, 1);
}
break;

View File

@ -77,6 +77,7 @@ struct _XcfInfo
FILE *fp;
guint cp;
gchar *filename;
GimpTattoo tattoo_state;
GimpLayer *active_layer;
GimpChannel *active_channel;
GimpDrawable *floating_sel_drawable;

View File

@ -217,6 +217,7 @@ xcf_load_invoker (Gimp *gimp,
{
info.cp = 0;
info.filename = filename;
info.tattoo_state = 0;
info.active_layer = NULL;
info.active_channel = NULL;
info.floating_sel_drawable = NULL;