Update of /cvsroot/libexif/libexif/libexif
In directory sc8-pr-cvs1:/tmp/cvs-serv6680/libexif
Modified Files:
exif-data.c exif-mnote-data.c
Log Message:
2003-10-27 Lutz Mueller <lu...@us...>
* libexif: The code now compiles and loads the canon maker note,
but crashes if you query its contents.
Index: exif-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- exif-data.c 26 Oct 2003 22:30:26 -0000 1.30
+++ exif-data.c 27 Oct 2003 20:07:11 -0000 1.31
@@ -135,8 +135,15 @@
memcpy (entry->data, d + doff, s);
/* If this is the MakerNote, remember the offset */
- if (entry->tag == EXIF_TAG_MAKER_NOTE)
+ if (entry->tag == EXIF_TAG_MAKER_NOTE) {
+#ifdef DEBUG
+ printf ("%02x %02x %02x %02x %02x %02x %02x\n",
+ entry->data[0], entry->data[1], entry->data[2],
+ entry->data[3], entry->data[4], entry->data[5],
+ entry->data[6]);
+#endif
data->priv->offset_mnote = doff;
+ }
}
static void
@@ -958,4 +965,6 @@
d.new = order;
exif_data_foreach_content (data, content_set_byte_order, &d);
data->priv->order = order;
+ if (data->priv->md)
+ exif_mnote_data_set_byte_order (data->priv->md, order);
}
Index: exif-mnote-data.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/exif-mnote-data.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- exif-mnote-data.c 26 Oct 2003 22:30:26 -0000 1.2
+++ exif-mnote-data.c 27 Oct 2003 20:07:11 -0000 1.3
@@ -39,7 +39,6 @@
if (!d->priv) return;
memset (d->priv, 0, sizeof (ExifMnoteDataPriv));
d->priv->ref_count = 1;
- memset (&d->methods, 0, sizeof (ExifMnoteDataMethods));
}
void
|
