From: Lutz M?l. <lu...@us...> - 2004-03-15 23:24:04
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1040/libexif/pentax Modified Files: exif-mnote-data-pentax.c Log Message: 2004-03-16 Lutz Mueller <lu...@us...> * libexif/pentax/exif-mnote-data-pentax.c: Another suggestion by Joerg Hoh <jo...@de...>. Index: exif-mnote-data-pentax.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- exif-mnote-data-pentax.c 1 Mar 2004 11:56:37 -0000 1.5 +++ exif-mnote-data-pentax.c 15 Mar 2004 23:14:49 -0000 1.6 @@ -76,20 +76,19 @@ ExifShort c; /* Number of entries */ - if (buf_size < 2) - return; + if (buf_size < 2) return; c = exif_get_short (buf + 6 + n->offset, n->order); + n->entries = malloc (sizeof (MnotePentaxEntry) * c); + memset (n->entries, 0, sizeof (MnotePentaxEntry) * c); for (i = 0; i < c; i++) { o = 6 + 2 + n->offset + 12 * i; if (o + 8 > buf_size) return; n->count = i + 1; - n->entries = realloc (n->entries, sizeof (MnotePentaxEntry)*(i+1)); - memset (&n->entries[i], 0, sizeof (MnotePentaxEntry)); - n->entries[i].tag = exif_get_short (buf + o, n->order); + n->entries[i].tag = exif_get_short (buf + o + 0, n->order); n->entries[i].format = exif_get_short (buf + o + 2, n->order); - n->entries[i].components = exif_get_long (buf + o + 4, n->order); + n->entries[i].components = exif_get_long (buf + o + 4, n->order); n->entries[i].order = n->order; /* |