Update of /cvsroot/libexif/libexif/libexif/canon
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9174
Modified Files:
mnote-canon-entry.c
Log Message:
Zero value for Self-Timer is not invalid, it means "Off"
Index: mnote-canon-entry.c
===================================================================
RCS file: /cvsroot/libexif/libexif/libexif/canon/mnote-canon-entry.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -d -r1.20 -r1.21
--- mnote-canon-entry.c 24 Apr 2007 04:48:29 -0000 1.20
+++ mnote-canon-entry.c 10 May 2007 16:50:20 -0000 1.21
@@ -467,7 +467,10 @@ mnote_canon_entry_get_value (const Mnote
vs = exif_get_short (entry->data + 2 + t * 2, entry->order);
switch (t) {
case 1:
- if (!vs) break;
+ if (!vs) {
+ strncpy(val, _("Off"), maxlen);
+ break;
+ }
snprintf (val, maxlen, _("%i (ms)"), vs * 100);
break;
case 15:
@@ -559,7 +562,10 @@ mnote_canon_entry_get_value (const Mnote
snprintf (val, maxlen, _("%u mm"), vs);
break;
case 28:
- if (!vs) break;
+ if (!vs) {
+ strncpy(val, _("Off"), maxlen);
+ break;
+ }
snprintf (val, maxlen, _("%i (ms)"), vs * 100);
break;
default:
|
