From: Dan F. <dfa...@us...> - 2009-01-24 00:50:21
|
Update of /cvsroot/libexif/libexif/contrib/examples In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20094 Modified Files: photographer.c Log Message: Removed a C99ism Index: photographer.c =================================================================== RCS file: /cvsroot/libexif/libexif/contrib/examples/photographer.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -d -r1.1 -r1.2 --- photographer.c 3 Jan 2009 08:17:37 -0000 1.1 +++ photographer.c 24 Jan 2009 00:50:13 -0000 1.2 @@ -68,6 +68,7 @@ static void show_mnote_tag(ExifData *d, int main(int argc, char **argv) { ExifData *ed; + ExifEntry *entry; if (argc < 2) { printf("Usage: %s image.jpg\n", argv[0]); @@ -99,8 +100,7 @@ int main(int argc, char **argv) * manufacturer tag to see if this image could have one of the recognized * MakerNote tags. */ - ExifEntry *entry = - exif_content_get_entry(ed->ifd[EXIF_IFD_0], EXIF_TAG_MAKE); + entry = exif_content_get_entry(ed->ifd[EXIF_IFD_0], EXIF_TAG_MAKE); if (entry) { char buf[64]; @@ -109,13 +109,11 @@ int main(int argc, char **argv) trim_spaces(buf); if (!strcmp(buf, "Canon")) { - /* MNOTE_CANON_TAG_OWNER */ - show_mnote_tag(ed, 9); + show_mnote_tag(ed, 9); /* MNOTE_CANON_TAG_OWNER */ } else if (!strcmp(buf, "Asahi Optical Co.,Ltd.") || !strcmp(buf, "PENTAX Corporation")) { - /* MNOTE_PENTAX2_TAG_HOMETOWN_CITY */ - show_mnote_tag(ed, 0x23); + show_mnote_tag(ed, 0x23); /* MNOTE_PENTAX2_TAG_HOMETOWN_CITY */ } } } |