Assert that exif attribute is NULL on load. (eog_image_free_mem): Free

2003-03-13  Jens Finke  <jens@triq.net>

	* libeog/eog-image.c (real_image_load): Assert that exif attribute
	is NULL on load.
	(eog_image_free_mem): Free exif info too.
This commit is contained in:
Jens Finke 2003-03-13 15:59:32 +00:00 committed by Jens Finke
parent ff63f7d3b9
commit 22157c552a
2 changed files with 14 additions and 7 deletions

View file

@ -1,3 +1,9 @@
2003-03-13 Jens Finke <jens@triq.net>
* libeog/eog-image.c (real_image_load): Assert that exif attribute
is NULL on load.
(eog_image_free_mem): Free exif info too.
2003-03-13 Jens Finke <jens@triq.net>
Added optional libexif support to read information stored in the

View file

@ -786,6 +786,7 @@ real_image_load (gpointer data)
#endif
g_assert (priv->image == NULL);
g_assert (priv->exif == NULL);
result = gnome_vfs_open_uri (&handle, priv->uri, GNOME_VFS_OPEN_READ);
if (result != GNOME_VFS_OK) {
@ -840,13 +841,6 @@ real_image_load (gpointer data)
g_mutex_lock (priv->status_mutex);
#if HAVE_EXIF
if (priv->exif != NULL) {
exif_data_unref (priv->exif);
priv->exif = NULL;
}
#endif
if (failed) {
if (priv->image != NULL) {
g_object_unref (priv->image);
@ -1216,6 +1210,13 @@ eog_image_free_mem (EogImage *img)
gdk_pixbuf_unref (priv->image);
priv->image = NULL;
}
#if HAVE_EXIF
if (priv->exif != NULL) {
exif_data_unref (priv->exif);
priv->exif = NULL;
}
#endif
}
const gchar*