/* mnote-olympus-entry.c
*
- * Copyright (c) 2002 Lutz Mueller <lutz@users.sourceforge.net>
+ * Copyright (c) 2002-2009 Lutz Mueller <lutz@users.sourceforge.net> et. al.
*
* 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>
} \
}
+#define R2L(n) ((n).denominator ? (long)(n).numerator/(n).denominator : 0L)
+#define R2D(n) ((n).denominator ? (double)(n).numerator/(n).denominator : 0.0)
+
static const struct {
- ExifTag tag;
- ExifFormat fmt;
+ MnoteOlympusTag tag;
+ ExifFormat fmt;
struct {
int index;
const char *string;
- } elem[10];
+ } elem[24];
} items[] = {
#ifndef NO_VERBOSE_TAG_DATA
{ MNOTE_NIKON_TAG_LENSTYPE, EXIF_FORMAT_BYTE,
- { {0, N_("AF non D Lens")},
+ { {0, N_("AF non D lens")},
{1, N_("Manual")},
- {2, N_("AF-D or AF-S Lens")},
- {6, N_("AF-D G Lens")},
- {10, N_("AF-D VR Lens")},
+ {2, N_("AF-D or AF-S lens")},
+ {6, N_("AF-D G lens")},
+ {10, N_("AF-D VR lens")},
+ {14, N_("AF-D G VR lens")},
{0, NULL}}},
{ MNOTE_NIKON_TAG_FLASHUSED, EXIF_FORMAT_BYTE,
{ {0, N_("Flash did not fire")},
{4, N_("Flash unit unknown")},
{7, N_("Flash is external")},
- {9, N_("Flash is on Camera")},
+ {9, N_("Flash is on camera")},
{0, NULL}}},
{ MNOTE_NIKON1_TAG_QUALITY, EXIF_FORMAT_SHORT,
- { {1, N_("VGA Basic")},
- {2, N_("VGA Normal")},
- {3, N_("VGA Fine")},
- {4, N_("SXGA Basic")},
- {5, N_("SXGA Normal")},
- {6, N_("SXGA Fine")},
- {10, N_("2 MPixel Basic")},
- {11, N_("2 MPixel Normal")},
- {12, N_("2 MPixel Fine")},
+ { {1, N_("VGA basic")},
+ {2, N_("VGA normal")},
+ {3, N_("VGA fine")},
+ {4, N_("SXGA basic")},
+ {5, N_("SXGA normal")},
+ {6, N_("SXGA fine")},
+ {10, N_("2 Mpixel basic")},
+ {11, N_("2 Mpixel normal")},
+ {12, N_("2 Mpixel fine")},
{0, NULL}}},
{ MNOTE_NIKON1_TAG_COLORMODE, EXIF_FORMAT_SHORT,
{ {1, N_("Color")},
{4, N_("Contrast-")},
{0, NULL}}},
{ MNOTE_NIKON1_TAG_CCDSENSITIVITY, EXIF_FORMAT_SHORT,
- { {0, N_("ISO80")},
- {2, N_("ISO160")},
- {4, N_("ISO320")},
- {5, N_("ISO100")},
+ { {0, N_("ISO 80")},
+ {2, N_("ISO 160")},
+ {4, N_("ISO 320")},
+ {5, N_("ISO 100")},
{0, NULL}}},
{ MNOTE_NIKON1_TAG_WHITEBALANCE, EXIF_FORMAT_SHORT,
{ {0, N_("Auto")},
{6, N_("SpeedLight")},
{0, NULL}}},
{ MNOTE_NIKON1_TAG_CONVERTER, EXIF_FORMAT_SHORT,
- { {0, N_("No Fisheye")},
- {1, N_("Fisheye On")},
+ { {0, N_("No fisheye")},
+ {1, N_("Fisheye on")},
{0, NULL}}},
{ MNOTE_OLYMPUS_TAG_QUALITY, EXIF_FORMAT_SHORT,
- { {1, N_("SQ")},
- {2, N_("HQ")},
- {3, N_("SHQ")},
- {4, N_("RAW")},
- {5, N_("SQ1")},
- {6, N_("SQ2")},
- {17, N_("Standard")},
- {529, N_("High")},
+ { {1, N_("Normal, SQ")},
+ {2, N_("Normal, HQ")},
+ {3, N_("Normal, SHQ")},
+ {4, N_("Normal, RAW")},
+ {5, N_("Normal, SQ1")},
+ {6, N_("Normal, SQ2")},
+ {7, N_("Normal, super high")},
+ {17, N_("Normal, standard")},
+ {0x101, N_("Fine, SQ")},
+ {0x102, N_("Fine, HQ")},
+ {0x103, N_("Fine, SHQ")},
+ {0x104, N_("Fine, RAW")},
+ {0x105, N_("Fine, SQ1")},
+ {0x106, N_("Fine, SQ2")},
+ {0x107, N_("Fine, super high")},
+ {0x201, N_("Super fine, SQ")},
+ {0x202, N_("Super fine, HQ")},
+ {0x203, N_("Super fine, SHQ")},
+ {0x204, N_("Super fine, RAW")},
+ {0x205, N_("Super fine, SQ1")},
+ {0x206, N_("Super fine, SQ2")},
+ {0x207, N_("Super fine, super high")},
+ {0x211, N_("Super fine, high")},
{0, NULL}}},
{ MNOTE_OLYMPUS_TAG_MACRO, EXIF_FORMAT_SHORT,
{ {0, N_("No")},
{1, N_("Yes")},
- {2, N_("Super Macro")},
+ {2, N_("Super macro")},
{0, NULL}}},
{ MNOTE_OLYMPUS_TAG_BWMODE, EXIF_FORMAT_SHORT,
{ {0, N_("No")},
{ {0, N_("None")},
{1, N_("Internal")},
{4, N_("External")},
- {5, N_("Internal + External")},
+ {5, N_("Internal + external")},
{0, NULL}}},
{ MNOTE_OLYMPUS_TAG_FOCUSRANGE, EXIF_FORMAT_SHORT,
{ {0, N_("Normal")},
{ {0, N_("Interlaced")},
{1, N_("Progressive")},
{0, NULL}}},
+
{ MNOTE_SANYO_TAG_SEQUENTIALSHOT, EXIF_FORMAT_SHORT,
{ {0, N_("None")},
{1, N_("Standard")},
{2, N_("Best")},
- {3, N_("Adjust Exposure")},
+ {3, N_("Adjust exposure")},
+ {0, NULL}}},
+ { MNOTE_SANYO_TAG_FOCUSMODE, EXIF_FORMAT_SHORT,
+ { {1, N_("Spot focus")},
+ {2, N_("Normal focus")},
{0, NULL}}},
{ MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE, EXIF_FORMAT_SHORT,
{ {0, N_("Record while down")},
{ {0, N_("No")},
{1, N_("Yes")},
{0, NULL}}},
+ { MNOTE_SANYO_TAG_CCDSENSITIVITY, EXIF_FORMAT_SHORT,
+ { {0, N_("Auto")},
+ {1, N_("ISO 50")},
+ {3, N_("ISO 100")},
+ {4, N_("ISO 200")},
+ {5, N_("ISO 400")},
+ {0, NULL}}},
{ MNOTE_SANYO_TAG_SCENESELECT, EXIF_FORMAT_SHORT,
{ {0, N_("Off")},
{1, N_("Sport")},
{
char buf[30];
ExifLong vl;
+ ExifSLong vsl;
ExifShort vs = 0;
ExifSShort vss = 0;
ExifRational vr, vr2;
if ((!entry->data) && (entry->components > 0))
return (v);
+ if ((!entry->data) && (entry->size > 0))
+ return NULL; /* internal inconsistency error */
+
switch (entry->tag) {
/* Nikon */
case MNOTE_NIKON_TAG_FIRMWARE:
CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
CC (entry->components, 4, v, maxlen);
- vl = exif_get_long (entry->data, entry->order);
+ vl = exif_get_long (entry->data, EXIF_BYTE_ORDER_INTEL);
if ((vl & 0xF0F0F0F0) == 0x30303030) {
memcpy (v, entry->data, MIN (maxlen, 4));
} else {
case MNOTE_NIKON_TAG_ISO:
CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
CC (entry->components, 2, v, maxlen);
- //vs = exif_get_short (entry->data, entry->order);
+ /*vs = exif_get_short (entry->data, entry->order);*/
vs = exif_get_short (entry->data + 2, entry->order);
snprintf (v, maxlen, "ISO %hd", vs);
break;
case MNOTE_NIKON_TAG_ISO2:
CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
CC (entry->components, 2, v, maxlen);
- //vs = exif_get_short (entry->data, entry->order);
+ /*vs = exif_get_short (entry->data, entry->order);*/
vs = exif_get_short (entry->data + 2, entry->order);
snprintf (v, maxlen, "ISO2 %hd", vs);
break;
case MNOTE_NIKON_TAG_QUALITY:
- CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
- //CC (entry->components, 8, v, maxlen);
- //vl = exif_get_long (entry->data , entry->order);
- //printf("-> 0x%04x\n",entry->data);
- //printf("-> 0x%s<\n",entry->data - 0);
- memcpy(v, entry->data, MIN(maxlen, entry->size));
- //snprintf (v, maxlen, "%s<", ( entry->data - 9 );
- break;
case MNOTE_NIKON_TAG_COLORMODE:
case MNOTE_NIKON_TAG_COLORMODE1:
case MNOTE_NIKON_TAG_WHITEBALANCE:
case MNOTE_NIKON_TAG_IMAGEADJUSTMENT:
case MNOTE_NIKON_TAG_ADAPTER:
case MNOTE_NIKON_TAG_SATURATION2:
- case MNOTE_EPSON_TAG_OEM_MODEL:
+ case MNOTE_EPSON_TAG_SOFTWARE:
CF (entry->format, EXIF_FORMAT_ASCII, v, maxlen);
memcpy(v, entry->data, MIN (maxlen, entry->size));
break;
break;
case MNOTE_NIKON_TAG_LENS_FSTOPS:
case MNOTE_NIKON_TAG_EXPOSUREDIFF: {
- unsigned char a,b,c,d;
+ unsigned char a,b,c;
CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
CC (entry->components, 4, v, maxlen);
vl = exif_get_long (entry->data, entry->order);
- a = (vl>>24)&0xff; b = (vl>>16)&0xff; c = (vl>>8)&0xff; d = (vl)&0xff;
+ a = (vl>>24)&0xff; b = (vl>>16)&0xff; c = (vl>>8)&0xff;
snprintf (v, maxlen, "%.1f", c?(float)a*((float)b/(float)c):0 );
break;
}
CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
CC (entry->components, 4, v, maxlen);
vr = exif_get_rational (entry->data, entry->order);
- r = (double)vr.numerator / vr.denominator;
+ r = R2D(vr);
vr = exif_get_rational (entry->data+8, entry->order);
- b = (double)vr.numerator / vr.denominator;
- //printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator);
- snprintf (v, maxlen, _("Red Correction %f, Blue Correction %f"), r,b);
+ b = R2D(vr);
+ snprintf (v, maxlen, _("Red Correction %f, blue Correction %f"), r,b);
break;
case MNOTE_NIKON_TAG_MANUALFOCUSDISTANCE:
CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
CC (entry->components, 1, v, maxlen);
vr = exif_get_rational (entry->data, entry->order);
- if (vr.numerator) {
- r = (double)vr.numerator / vr.denominator;
- snprintf (v, maxlen, _("%2.2f meters"), r);
- } else {
+ if (!vr.numerator || !vr.denominator) {
strncpy (v, _("No manual focus selection"), maxlen);
+ } else {
+ r = R2D(vr);
+ snprintf (v, maxlen, _("%2.2f meters"), r);
}
break;
case MNOTE_NIKON_TAG_SENSORPIXELSIZE:
CC (entry->components, 2, v, maxlen);
vr = exif_get_rational (entry->data, entry->order);
vr2 = exif_get_rational (entry->data+8, entry->order);
- r = (double)vr.numerator / vr.denominator;
- b = (double)vr2.numerator / vr2.denominator;
+ r = R2D(vr);
+ b = R2D(vr2);
snprintf (v, maxlen, "%2.2f x %2.2f um", r, b);
break;
case MNOTE_NIKON_TAG_BRACKETING:
CF (entry->format, EXIF_FORMAT_UNDEFINED, v, maxlen);
CC (entry->components, 4, v, maxlen);
switch ( *( entry->data+1) ) {
- case 0: strncpy (v, _("AF Position: Center"), maxlen); break;
- case 1: strncpy (v, _("AF Position: Top"), maxlen); break;
- case 2: strncpy (v, _("AF Position: Bottom"), maxlen); break;
- case 3: strncpy (v, _("AF Position: Left"), maxlen); break;
- case 4: strncpy (v, _("AF Position: Right"), maxlen); break;
- case 5: strncpy (v, _("AF Position: Upper-left"), maxlen); break;
- case 6: strncpy (v, _("AF Position: Upper-right"), maxlen); break;
- case 7: strncpy (v, _("AF Position: Lower-left"), maxlen); break;
- case 8: strncpy (v, _("AF Position: Lower-right"), maxlen); break;
- case 9: strncpy (v, _("AF Position: Far Left"), maxlen); break;
- case 10: strncpy (v, _("AF Position: Far Right"), maxlen); break;
- default: strncpy (v, _("Unknown AF Position"), maxlen);
+ case 0: strncpy (v, _("AF position: center"), maxlen); break;
+ case 1: strncpy (v, _("AF position: top"), maxlen); break;
+ case 2: strncpy (v, _("AF position: bottom"), maxlen); break;
+ case 3: strncpy (v, _("AF position: left"), maxlen); break;
+ case 4: strncpy (v, _("AF position: right"), maxlen); break;
+ case 5: strncpy (v, _("AF position: upper-left"), maxlen); break;
+ case 6: strncpy (v, _("AF position: upper-right"), maxlen); break;
+ case 7: strncpy (v, _("AF position: lower-left"), maxlen); break;
+ case 8: strncpy (v, _("AF position: lower-right"), maxlen); break;
+ case 9: strncpy (v, _("AF position: far left"), maxlen); break;
+ case 10: strncpy (v, _("AF position: far right"), maxlen); break;
+ default: strncpy (v, _("Unknown AF position"), maxlen);
}
break;
case MNOTE_OLYMPUS_TAG_FLASHDEVICE:
if (entry->format == EXIF_FORMAT_RATIONAL) {
CC (entry->components, 1, v, maxlen);
vr = exif_get_rational (entry->data, entry->order);
- r = (double)vr.numerator / vr.denominator;
- if (!vr.numerator) {
+ if (!vr.numerator || !vr.denominator) {
strncpy (v, _("None"), maxlen);
} else {
+ r = R2D(vr);
snprintf (v, maxlen, "%2.2f", r);
}
break;
case MNOTE_OLYMPUS_TAG_PREVIEWIMAGEVALID:
case MNOTE_OLYMPUS_TAG_CCDSCANMODE:
case MNOTE_SANYO_TAG_SEQUENTIALSHOT:
+ case MNOTE_SANYO_TAG_FOCUSMODE:
case MNOTE_SANYO_TAG_RECORDSHUTTERRELEASE:
case MNOTE_SANYO_TAG_RESAVED:
+ case MNOTE_SANYO_TAG_CCDSENSITIVITY:
case MNOTE_SANYO_TAG_SCENESELECT:
case MNOTE_SANYO_TAG_SEQUENCESHOTINTERVAL:
CC (entry->components, 1, v, maxlen);
case MNOTE_SANYO_TAG_WIDERANGE:
case MNOTE_SANYO_TAG_COLORADJUSTMENTMODE:
case MNOTE_SANYO_TAG_QUICKSHOT:
- case MNOTE_SANYO_TAG_SELFTIMER:
case MNOTE_SANYO_TAG_VOICEMEMO:
case MNOTE_SANYO_TAG_FLICKERREDUCE:
case MNOTE_SANYO_TAG_OPTICALZOOM:
strncpy (v, _("On"), maxlen);
break;
default:
- strncpy (v, _("Unknown"), maxlen);
+ sprintf (buf, _("Unknown %hu"), vs);
+ strncat (v, buf, maxlen - strlen (v));
+ break;
+ }
+ break;
+ case MNOTE_SANYO_TAG_SELFTIMER:
+ CF (entry->format, EXIF_FORMAT_SHORT, v, maxlen);
+ CC (entry->components, 1, v, maxlen);
+ vs = exif_get_short (entry->data, entry->order);
+ switch (vs) {
+ case 0:
+ strncpy (v, _("Off"), maxlen);
+ break;
+ case 1:
+ strncpy (v, _("On"), maxlen);
+ break;
+ case 2:
+ strncpy (v, _("2 sec."), maxlen);
+ break;
+ default:
+ sprintf (buf, _("Unknown %hu"), vs);
+ strncat (v, buf, maxlen - strlen (v));
break;
}
break;
double c,d;
unsigned long a,b;
vr = exif_get_rational (entry->data, entry->order);
- a = vr.numerator / vr.denominator;
+ a = R2L(vr);
vr = exif_get_rational (entry->data+8, entry->order);
- b = vr.numerator / vr.denominator;
+ b = R2L(vr);
vr = exif_get_rational (entry->data+16, entry->order);
- c = (double)vr.numerator / vr.denominator;
+ c = R2D(vr);
vr = exif_get_rational (entry->data+24, entry->order);
- d = (double)vr.numerator / vr.denominator;
- //printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator);
+ d = R2D(vr);
snprintf (v, maxlen, "%ld-%ldmm 1:%3.1f - %3.1f",a,b,c,d);
}
break;
vl = exif_get_long (entry->data, entry->order);
switch (vl) {
case 0:
- strncpy (v, _("normal"), maxlen);
+ strncpy (v, _("Normal"), maxlen);
break;
case 1:
- strncpy (v, _("unknown"), maxlen);
+ strncpy (v, _("Unknown"), maxlen);
break;
case 2:
- strncpy (v, _("fast"), maxlen);
+ strncpy (v, _("Fast"), maxlen);
break;
case 3:
- strncpy (v, _("panorama"), maxlen);
+ strncpy (v, _("Panorama"), maxlen);
break;
default:
- snprintf (v, maxlen, _("%li"), (long int) vl);
+ snprintf (v, maxlen, "%li", (long int) vl);
}
vl = exif_get_long (entry->data + 4, entry->order);
snprintf (buf, sizeof (buf), "/%li/", (long int) vl);
vl = exif_get_long (entry->data + 8, entry->order);
switch (vl) {
case 1:
- strncat (v, _("left to right"), maxlen - strlen (v));
+ strncat (v, _("Left to right"), maxlen - strlen (v));
break;
case 2:
- strncat (v, _("right to left"), maxlen - strlen (v));
+ strncat (v, _("Right to left"), maxlen - strlen (v));
break;
case 3:
- strncat (v, _("bottom to top"), maxlen - strlen (v));
+ strncat (v, _("Bottom to top"), maxlen - strlen (v));
break;
case 4:
- strncat (v, _("top to bottom"), maxlen - strlen (v));
+ strncat (v, _("Top to bottom"), maxlen - strlen (v));
break;
default:
- snprintf (buf, sizeof (buf), _("%li"),
+ snprintf (buf, sizeof (buf), "%li",
(long int) vl);
strncat (v, buf, maxlen - strlen (v));
}
case MNOTE_OLYMPUS_TAG_UNKNOWN_4:
CF (entry->format, EXIF_FORMAT_LONG, v, maxlen);
CC (entry->components, 30, v, maxlen);
- /* TODO: display me */
+ for (i=0; i < (int)entry->components; ++i) {
+ vl = exif_get_long (entry->data+4*i, entry->order);
+ sprintf (buf, "%lu ", (unsigned long)vl);
+ strncat (v, buf, maxlen - strlen (v));
+ }
break;
case MNOTE_OLYMPUS_TAG_FOCUSDIST:
CF (entry->format, EXIF_FORMAT_RATIONAL, v, maxlen);
CC (entry->components, 1, v, maxlen);
vr = exif_get_rational (entry->data, entry->order);
- if (vr.numerator == 0) {
+ if (!vr.numerator || !vr.denominator) {
strncpy (v, _("Unknown"), maxlen);
}
else {
unsigned long tmp = vr.numerator / vr.denominator;
- /* printf("numerator %li, denominator %li\n", vr.numerator, vr.denominator); */
snprintf (v, maxlen, "%li mm", tmp);
}
break;
snprintf (v, maxlen, _("Manual: %liK"), colorTemp);
}
else {
- strncpy (v, _("Manual: Unknown"), maxlen);
+ strncpy (v, _("Manual: unknown"), maxlen);
}
}
vs = exif_get_short (entry->data, entry->order);
snprintf (v, maxlen, "%hu", vs);
break;
+ case EXIF_FORMAT_SSHORT:
+ CC (entry->components, 1, v, maxlen);
+ vss = exif_get_sshort (entry->data, entry->order);
+ snprintf (v, maxlen, "%hi", vss);
+ break;
case EXIF_FORMAT_LONG:
CC (entry->components, 1, v, maxlen);
vl = exif_get_long (entry->data, entry->order);
- snprintf (v, maxlen, "%li", (long int) vl);
+ snprintf (v, maxlen, "%lu", (long unsigned) vl);
+ break;
+ case EXIF_FORMAT_SLONG:
+ CC (entry->components, 1, v, maxlen);
+ vsl = exif_get_slong (entry->data, entry->order);
+ snprintf (v, maxlen, "%li", (long int) vsl);
break;
case EXIF_FORMAT_RATIONAL:
CC (entry->components, 1, v, maxlen);
if (!vr.denominator) {
strncpy (v, _("Infinite"), maxlen);
} else {
- r = (double)vr.numerator / vr.denominator;
+ r = R2D(vr);
snprintf (v, maxlen, "%2.3f", r);
}
break;
if (!vsr.denominator) {
strncpy (v, _("Infinite"), maxlen);
} else {
- r = (double)vsr.numerator / vsr.denominator;
+ r = R2D(vsr);
snprintf (v, maxlen, "%2.3f", r);
}
break;
projects / platform / upstream / libexif.git / blobdiff