/* exif-content.c
*
- * Copyright © 2001 Lutz Müller <lutz@users.sourceforge.net>
+ * Copyright (c) 2001 Lutz Mueller <lutz@users.sourceforge.net>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
*/
#include <config.h>
exif_content_remove_entry (ExifContent *c, ExifEntry *e)
{
unsigned int i;
- ExifEntry **t;
+ ExifEntry **t, *temp;
if (!c || !c->priv || !e || (e->parent != c)) return;
/* Search the entry */
- for (i = 0; i < c->count; i++) if (c->entries[i] == e) break;
- if (i == c->count) return;
+ for (i = 0; i < c->count; i++)
+ if (c->entries[i] == e)
+ break;
+
+ if (i == c->count)
+ return;
/* Remove the entry */
- memmove (&c->entries[i], &c->entries[i + 1],
- sizeof (ExifEntry*) * (c->count - i - 1));
- e->parent = NULL;
- exif_entry_unref (e);
- t = exif_mem_realloc (c->priv->mem, c->entries,
- sizeof(ExifEntry*) * (c->count - 1));
- if (t) {
+ temp = c->entries[c->count-1];
+ if (c->count > 1) {
+ t = exif_mem_realloc (c->priv->mem, c->entries,
+ sizeof(ExifEntry*) * (c->count - 1));
+ if (!t) {
+ return;
+ }
c->entries = t;
c->count--;
+ if (i != c->count) { /* we deallocated the last slot already */
+ memmove (&t[i], &t[i + 1], sizeof (ExifEntry*) * (c->count - i - 1));
+ t[c->count-1] = temp;
+ }
+ } else {
+ exif_mem_free (c->priv->mem, c->entries);
+ c->entries = NULL;
+ c->count = 0;
}
+ e->parent = NULL;
+ exif_entry_unref (e);
}
ExifEntry *
if (!c || !c->parent) return EXIF_IFD_COUNT;
return
+ ((c)->parent->ifd[EXIF_IFD_EXIF] == (c)) ? EXIF_IFD_EXIF :
((c)->parent->ifd[EXIF_IFD_0] == (c)) ? EXIF_IFD_0 :
((c)->parent->ifd[EXIF_IFD_1] == (c)) ? EXIF_IFD_1 :
- ((c)->parent->ifd[EXIF_IFD_EXIF] == (c)) ? EXIF_IFD_EXIF :
((c)->parent->ifd[EXIF_IFD_GPS] == (c)) ? EXIF_IFD_GPS :
((c)->parent->ifd[EXIF_IFD_INTEROPERABILITY] == (c)) ? EXIF_IFD_INTEROPERABILITY :
EXIF_IFD_COUNT;
exif_entry_fix (e);
}
+/*!
+ * Check if this entry is unknown and if so, delete it.
+ * \note Be careful calling this function in a loop. Deleting an entry from
+ * an ExifContent changes the index of subsequent entries, as well as the
+ * total size of the entries array.
+ */
+static void
+remove_not_recorded (ExifEntry *e, void *UNUSED(data))
+{
+ ExifIfd ifd = exif_entry_get_ifd(e) ;
+ ExifContent *c = e->parent;
+ ExifDataType dt = exif_data_get_data_type (c->parent);
+ ExifTag t = e->tag;
+
+ if (exif_tag_get_support_level_in_ifd (t, ifd, dt) ==
+ EXIF_SUPPORT_LEVEL_NOT_RECORDED) {
+ exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
+ "Tag 0x%04x is not recorded in IFD '%s' and has therefore been "
+ "removed.", t, exif_ifd_get_name (ifd));
+ exif_content_remove_entry (c, e);
+ }
+
+}
+
void
exif_content_fix (ExifContent *c)
{
ExifIfd ifd = exif_content_get_ifd (c);
ExifDataType dt;
- ExifTag t;
ExifEntry *e;
+ unsigned int i, num;
- if (!c) return;
+ if (!c)
+ return;
dt = exif_data_get_data_type (c->parent);
- /* First of all, fix all existing entries. */
+ /*
+ * First of all, fix all existing entries.
+ */
exif_content_foreach_entry (c, fix_func, NULL);
/*
- * Then check for existing tags that are not allowed and for
- * non-existing mandatory tags.
+ * Go through each tag and if it's not recorded, remove it. If one
+ * is removed, exif_content_foreach_entry() will skip the next entry,
+ * so if this happens do the loop again from the beginning to ensure
+ * they're all checked. This could be avoided if we stop relying on
+ * exif_content_foreach_entry but loop intelligently here.
*/
- for (t = 0; t <= 0xffff; t++) {
- switch (exif_tag_get_support_level_in_ifd (t, ifd, dt)) {
- case EXIF_SUPPORT_LEVEL_MANDATORY:
- if (exif_content_get_entry (c, t)) break;
+ do {
+ num = c->count;
+ exif_content_foreach_entry (c, remove_not_recorded, NULL);
+ } while (num != c->count);
+
+ /*
+ * Then check for non-existing mandatory tags and create them if needed
+ */
+ num = exif_tag_table_count();
+ for (i = 0; i < num; ++i) {
+ const ExifTag t = exif_tag_table_get_tag (i);
+ if (exif_tag_get_support_level_in_ifd (t, ifd, dt) ==
+ EXIF_SUPPORT_LEVEL_MANDATORY) {
+ if (exif_content_get_entry (c, t))
+ /* This tag already exists */
+ continue;
exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
"Tag '%s' is mandatory in IFD '%s' and has therefore been added.",
exif_tag_get_name_in_ifd (t, ifd), exif_ifd_get_name (ifd));
exif_content_add_entry (c, e);
exif_entry_initialize (e, t);
exif_entry_unref (e);
- break;
- case EXIF_SUPPORT_LEVEL_NOT_RECORDED:
- e = exif_content_get_entry (c, t);
- if (!e) break;
- exif_log (c->priv->log, EXIF_LOG_CODE_DEBUG, "exif-content",
- "Tag '%s' is not recorded in IFD '%s' and has therefore been "
- "removed.", exif_tag_get_name_in_ifd (t, ifd),
- exif_ifd_get_name (ifd));
- exif_content_remove_entry (c, e);
- break;
- case EXIF_SUPPORT_LEVEL_OPTIONAL:
- default:
- break;
}
}
}