Menu
▾
▴
libexif-cvs
|
From: Dan F. <dfa...@us...> - 2009-09-19 05:16:14
|
Update of /cvsroot/libexif/libexif/libexif/pentax In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21818/libexif/pentax Modified Files: exif-mnote-data-pentax.c exif-mnote-data-pentax.h mnote-pentax-entry.c Log Message: Added support for writing Pentax and Casio v2 MakerNotes Now displaying all components in Pentax and Casio v2 MakerNotes when a tag has more than one Index: exif-mnote-data-pentax.h =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -d -r1.5 -r1.6 --- exif-mnote-data-pentax.h 17 Feb 2008 18:31:57 -0000 1.5 +++ exif-mnote-data-pentax.h 19 Sep 2009 05:16:04 -0000 1.6 @@ -27,7 +27,7 @@ #include <libexif/pentax/mnote-pentax-entry.h> #include <libexif/exif-mem.h> -enum PentaxVersion {pentaxV1 = 1, pentaxV2 = 2, pentaxV3 = 4, casioV2 = 4 }; +enum PentaxVersion {pentaxV1 = 1, pentaxV2 = 2, pentaxV3 = 3, casioV2 = 4 }; typedef struct _ExifMnoteDataPentax ExifMnoteDataPentax; Index: exif-mnote-data-pentax.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/exif-mnote-data-pentax.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -d -r1.15 -r1.16 --- exif-mnote-data-pentax.c 21 Mar 2009 22:03:09 -0000 1.15 +++ exif-mnote-data-pentax.c 19 Sep 2009 05:16:04 -0000 1.16 @@ -66,6 +66,136 @@ exif_mnote_data_pentax_get_value (ExifMn return mnote_pentax_entry_get_value (&n->entries[i], val, maxlen); } +/** + * @brief save the MnoteData from ne to buf + * + * @param ne extract the data from this structure + * @param *buf write the mnoteData to this buffer (buffer will be allocated) + * @param buf_size the final size of the buffer + */ +static void +exif_mnote_data_pentax_save (ExifMnoteData *ne, + unsigned char **buf, unsigned int *buf_size) +{ + ExifMnoteDataPentax *n = (ExifMnoteDataPentax *) ne; + size_t i, + base = 0, /* internal MakerNote tag number offset */ + o2 = 4 + 2; /* offset to first tag entry, past header */ + size_t datao = n->offset; /* this MakerNote style uses offsets + based on main IFD, not makernote IFD */ + + if (!n || !buf || !buf_size) return; + + /* + * Allocate enough memory for header, the number of entries, entries, + * and next IFD pointer + */ + *buf_size = o2 + 2 + n->count * 12 + 4; + switch (n->version) { + case casioV2: + base = MNOTE_PENTAX2_TAG_BASE; + *buf = exif_mem_alloc (ne->mem, *buf_size); + if (!*buf) return; + + /* Write the magic header */ + strcpy ((char *)*buf, "QVC"); + exif_set_short (*buf + 4, n->order, (ExifShort) 0); + + break; + + case pentaxV3: + base = MNOTE_PENTAX2_TAG_BASE; + *buf = exif_mem_alloc (ne->mem, *buf_size); + if (!*buf) return; + + /* Write the magic header */ + strcpy ((char *)*buf, "AOC"); + exif_set_short (*buf + 4, n->order, (ExifShort) ( + (n->order == EXIF_BYTE_ORDER_INTEL) ? + ('I' << 8) | 'I' : + ('M' << 8) | 'M')); + break; + + case pentaxV2: + base = MNOTE_PENTAX2_TAG_BASE; + *buf = exif_mem_alloc (ne->mem, *buf_size); + if (!*buf) return; + + /* Write the magic header */ + strcpy ((char *)*buf, "AOC"); + exif_set_short (*buf + 4, n->order, (ExifShort) 0); + break; + + case pentaxV1: + /* It looks like this format doesn't have a magic header as + * such, just has a fixed number of entries equal to 0x001b */ + *buf_size -= 6; + o2 -= 6; + *buf = exif_mem_alloc (ne->mem, *buf_size); + if (!*buf) return; + break; + + default: + /* internal error */ + return; + } + + /* Write the number of entries. */ + exif_set_short (*buf + o2, n->order, (ExifShort) n->count); + o2 += 2; + + /* Save each entry */ + for (i = 0; i < n->count; i++) { + size_t doff; /* offset to current data portion of tag */ + size_t s; + unsigned char *t; + size_t o = o2 + i * 12; /* current offset into output buffer */ + exif_set_short (*buf + o + 0, n->order, + (ExifShort) (n->entries[i].tag - base)); + exif_set_short (*buf + o + 2, n->order, + (ExifShort) n->entries[i].format); + exif_set_long (*buf + o + 4, n->order, + n->entries[i].components); + o += 8; + s = exif_format_get_size (n->entries[i].format) * + n->entries[i].components; + if (s > 65536) { + /* Corrupt data: EXIF data size is limited to the + * maximum size of a JPEG segment (64 kb). + */ + continue; + } + if (s > 4) { + size_t ts = *buf_size + s; + doff = *buf_size; + t = exif_mem_realloc (ne->mem, *buf, + sizeof (char) * ts); + if (!t) return; + *buf = t; + *buf_size = ts; + exif_set_long (*buf + o, n->order, datao + doff); + } else + doff = o; + + /* Write the data. */ + if (n->entries[i].data) { + memcpy (*buf + doff, n->entries[i].data, s); + } else { + /* Most certainly damaged input file */ + memset (*buf + doff, 0, s); + } + } + + /* Sanity check the buffer size */ + if (*buf_size < (o2 + n->count * 12 + 4)) { + exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteDataPentax", + "Buffer overflow"); + } + + /* Reset next IFD pointer */ + exif_set_long (*buf + o2 + n->count * 12, n->order, 0); +} + static void exif_mnote_data_pentax_load (ExifMnoteData *en, const unsigned char *buf, unsigned int buf_size) @@ -98,6 +228,7 @@ exif_mnote_data_pentax_load (ExifMnoteDa base = MNOTE_CASIO2_TAG_BASE; datao += 4 + 2; } else { + /* probably assert(!memcmp(buf + datao, "\x00\x1b", 2)) */ exif_log (en->log, EXIF_LOG_CODE_DEBUG, "ExifMnoteDataPentax", "Parsing Pentax maker note v1..."); n->version = pentaxV1; @@ -241,6 +372,7 @@ exif_mnote_data_pentax_new (ExifMem *mem d->methods.set_byte_order = exif_mnote_data_pentax_set_byte_order; d->methods.set_offset = exif_mnote_data_pentax_set_offset; d->methods.load = exif_mnote_data_pentax_load; + d->methods.save = exif_mnote_data_pentax_save; d->methods.count = exif_mnote_data_pentax_count; d->methods.get_id = exif_mnote_data_pentax_get_id; d->methods.get_name = exif_mnote_data_pentax_get_name; Index: mnote-pentax-entry.c =================================================================== RCS file: /cvsroot/libexif/libexif/libexif/pentax/mnote-pentax-entry.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -d -r1.18 -r1.19 --- mnote-pentax-entry.c 17 Feb 2008 18:31:57 -0000 1.18 +++ mnote-pentax-entry.c 19 Sep 2009 05:16:04 -0000 1.19 @@ -415,12 +415,36 @@ mnote_pentax_entry_get_value (MnotePenta strncpy (val, (char *)entry->data, MIN(maxlen, entry->size)); break; case EXIF_FORMAT_SHORT: - vs = exif_get_short (entry->data, entry->order); - snprintf (val, maxlen, "%i", vs); + { + const unsigned char *data = entry->data; + size_t len = strlen(val); + for(i=0; i<entry->components; i++) { + if ((i+1)*2 > entry->size) { + // Prevent buffer overflow + break; + } + vs = exif_get_short (data, entry->order); + snprintf (val+len, maxlen-len, "%i ", vs); + len = strlen(val); + data += 2; + } + } break; case EXIF_FORMAT_LONG: - vl = exif_get_long (entry->data, entry->order); - snprintf (val, maxlen, "%li", (long int) vl); + { + const unsigned char *data = entry->data; + size_t len = strlen(val); + for(i=0; i<entry->components; i++) { + if ((i+1)*4 > entry->size) { + // Prevent buffer overflow + break; + } + vl = exif_get_long (data, entry->order); + snprintf (val+len, maxlen-len, "%li", (long int) vl); + len = strlen(val); + data += 4; + } + } break; case EXIF_FORMAT_UNDEFINED: default: |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X