Menu
▾
▴
[libexif-cvs] exif/exif main.c, 1.62, 1.63 actions.c, 1.31, 1.32 actions.h, 1.9, 1.10
|
From: Lutz M. <lu...@us...> - 2008-02-17 18:17:20
|
Update of /cvsroot/libexif/exif/exif In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25690/exif Modified Files: main.c actions.c actions.h Log Message: 2008-02-17 Lutz Mueller <lu...@us...> * exif/main.c: Move the remaining actions to... * exif/actions.[c,h]: ...here. While at it, implement a --create-exif option (suggestion and patch by Alexander Drozdov <dza...@mt...>). This needs latest libexif, therefore ... * configure.ac: ...require at least libexif 0.6.16.2. Index: main.c =================================================================== RCS file: /cvsroot/libexif/exif/exif/main.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -p -d -r1.62 -r1.63 --- main.c 17 Feb 2008 11:49:03 -0000 1.62 +++ main.c 17 Feb 2008 18:17:08 -0000 1.63 @@ -33,8 +33,6 @@ #include <libexif/exif-utils.h> #include <libexif/exif-loader.h> -#include "libjpeg/jpeg-data.h" - #include "actions.h" #include "exif-i18n.h" #include "utils.h" @@ -55,124 +53,6 @@ # define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } #endif -static void -internal_error (void) -{ - fprintf (stderr, _("Internal error. Please " - "contact <%s>."), - PACKAGE_BUGREPORT); - fputc ('\n', stderr); - exit (1); -} - -static void -convert_arg_to_entry (const char *set_value, ExifEntry *e, ExifByteOrder o) -{ - unsigned int i, numcomponents; - char *value_p; - - /* - * ASCII strings are handled separately, - * since they don't require any conversion. - */ - if (e->format == EXIF_FORMAT_ASCII) { - if (e->data) free (e->data); - e->components = strlen (set_value) + 1; - e->size = sizeof (char) * e->components; - e->data = malloc (e->size); - if (!e->data) { - fprintf (stderr, _("Not enough memory.")); - fputc ('\n', stderr); - exit (1); - } - strcpy ((char *) e->data, (char *) set_value); - return; - } - - /* - * Make sure we can handle this entry - */ - if ((e->components == 0) && *set_value) { - fprintf (stderr, _("Setting a value for this tag " - "is unsupported!")); - fputc ('\n', stderr); - exit (1); - } - - value_p = (char*) set_value; - numcomponents = e->components; - for (i = 0; i < numcomponents; ++i) { - const char *begin, *end; - unsigned char *buf, s; - static const char comp_separ = ' '; - - begin = value_p; - value_p = strchr (begin, comp_separ); - if (!value_p) { - if (i != numcomponents - 1) { - fprintf (stderr, _("Too few components " - "specified!")); - fputc ('\n', stderr); - exit (1); - } - end = begin + strlen (begin); - } else end = value_p++; - - buf = malloc ((end - begin + 1) * sizeof (char)); - strncpy ((char *) buf, (char *) begin, end - begin); - buf[end - begin] = '\0'; - - s = exif_format_get_size (e->format); - switch (e->format) { - case EXIF_FORMAT_ASCII: - internal_error (); /* Previously handled */ - break; - case EXIF_FORMAT_SHORT: - exif_set_short (e->data + (s * i), o, atoi ((char *) buf)); - break; - case EXIF_FORMAT_SSHORT: - exif_set_sshort (e->data + (s * i), o, atoi ((char *) buf)); - break; - case EXIF_FORMAT_RATIONAL: - /* - * Hack to simplify the loop for rational numbers. - * Should really be using exif_set_rational instead - */ - if (i == 0) numcomponents *= 2; - s /= 2; - /* Fall through to LONG handler */ - case EXIF_FORMAT_LONG: - exif_set_long (e->data + (s * i), o, atol ((char *) buf)); - break; - case EXIF_FORMAT_SRATIONAL: - /* - * Hack to simplify the loop for rational numbers. - * Should really be using exif_set_srational instead - */ - if (i == 0) numcomponents *= 2; - s /= 2; - /* Fall through to SLONG handler */ - case EXIF_FORMAT_SLONG: - exif_set_slong (e->data + (s * i), o, atol ((char *) buf)); - break; - case EXIF_FORMAT_BYTE: - case EXIF_FORMAT_SBYTE: - case EXIF_FORMAT_FLOAT: - case EXIF_FORMAT_DOUBLE: - case EXIF_FORMAT_UNDEFINED: - default: - fprintf (stderr, _("Not yet implemented!")); - fputc ('\n', stderr); - exit (1); - } - free (buf); - } - if (value_p && *value_p) { - fprintf (stderr, _("Warning; Too many components specified!")); - fputc ('\n', stderr); - } -} - /* escape codes for output colors */ #define COL_BLUE "\033[34m" #define COL_GREEN "\033[32m" @@ -197,70 +77,27 @@ convert_arg_to_entry (const char *set_va } \ } while (0) -static void -log_func_exit (ExifLog *log, ExifLogCode code, const char *domain, - const char *format, va_list args, void *data) -{ - switch (code) { - case -1: - put_colorstring (stderr, COL_RED); - vfprintf (stderr, format, args); - fprintf (stderr, "\n"); - put_colorstring (stderr, COL_NORMAL); - exit (1); - case EXIF_LOG_CODE_NO_MEMORY: - case EXIF_LOG_CODE_CORRUPT_DATA: - put_colorstring (stderr, COL_RED); - fprintf (stderr, "%s (%s):\n", exif_log_code_get_title (code), domain); - vfprintf (stderr, format, args); - fprintf (stderr, "\n"); - put_colorstring (stderr, COL_NORMAL); - exit (1); - default: - return; - } -} - -static int -save_exif_data_to_file (ExifData *ed, ExifLog *log, ExifParams p) -{ - JPEGData *jdata; - unsigned char *d = NULL; - unsigned int ds; - - /* Parse the JPEG file. */ - jdata = jpeg_data_new (); - jpeg_data_log (jdata, log); - jpeg_data_load_file (jdata, p.fin); - - /* Make sure the EXIF data is not too big. */ - exif_data_save_data (ed, &d, &ds); - if (ds) { - free (d); - if (ds > 0xffff) { - fprintf (stderr, _("Too much EXIF data (%i bytes). " - "Only %i bytes are allowed."), ds, 0xffff); - fputc ('\n', stderr); - return (1); - } - }; - - jpeg_data_set_exif_data (jdata, ed); - - /* Save the modified image. */ - jpeg_data_save_file (jdata, p.fout); - jpeg_data_unref (jdata); - - fprintf (stdout, _("Wrote file '%s'."), p.fout); - fprintf (stdout, "\n"); +typedef struct { + unsigned int debug; - return (0); -} + /* input */ + int ignore_corrupted; + /* output */ + int corrupted; +} LogArg; static void log_func (ExifLog *log, ExifLogCode code, const char *domain, const char *format, va_list args, void *data) { + LogArg *log_arg = data; + + log_arg->corrupted = 0; + + /* + * When debugging, continue as far as possible. If not, make all errors + * fatal. + */ switch (code) { case -1: put_colorstring (stderr, COL_RED); @@ -269,14 +106,20 @@ log_func (ExifLog *log, ExifLogCode code put_colorstring (stderr, COL_NORMAL); exit (1); case EXIF_LOG_CODE_DEBUG: - put_colorstring (stdout, COL_GREEN); - fprintf (stdout, "%s: ", domain); - vfprintf (stdout, format, args); - put_colorstring (stdout, COL_NORMAL); - printf ("\n"); + if (log_arg->debug) { + put_colorstring (stdout, COL_GREEN); + fprintf (stdout, "%s: ", domain); + vfprintf (stdout, format, args); + put_colorstring (stdout, COL_NORMAL); + printf ("\n"); + } break; - case EXIF_LOG_CODE_NO_MEMORY: case EXIF_LOG_CODE_CORRUPT_DATA: + log_arg->corrupted = 1; + /* We ignore corrupted data event in some cases */ + if (log_arg->ignore_corrupted) + return; + case EXIF_LOG_CODE_NO_MEMORY: put_colorstring (stderr, "\033[31;1m"); put_colorstring (stderr, "\033[31;4m"); fprintf (stderr, exif_log_code_get_title (code)); @@ -289,13 +132,17 @@ log_func (ExifLog *log, ExifLogCode code vfprintf (stderr, format, args); put_colorstring (stderr, COL_NORMAL); fprintf (stderr, "\n"); + if (!log_arg->debug) + exit (1); break; default: - put_colorstring (stdout, COL_BLUE); - printf ("%s: ", domain); - vprintf (format, args); - put_colorstring (stdout, COL_NORMAL); - printf ("\n"); + if (log_arg->debug) { + put_colorstring (stdout, COL_BLUE); + printf ("%s: ", domain); + vprintf (format, args); + put_colorstring (stdout, COL_NORMAL); + printf ("\n"); + } break; } } @@ -308,12 +155,13 @@ log_func (ExifLog *log, ExifLogCode code */ static unsigned int list_tags = 0, show_description = 0; static unsigned int xml_output = 0; -static unsigned int extract_thumbnail = 0, remove_thumbnail = 0; -static unsigned int remove_tag = 0; -static unsigned int list_mnote = 0, debug = 0; +static unsigned int extract_thumbnail = 0, remove_thumb = 0; +static unsigned int remove_tag = 0, create_exif = 0; +static unsigned int list_mnote = 0; static unsigned int show_version = 0; -static const char *set_value = NULL, *ifd_string = NULL, *tag_string = NULL; -static ExifParams p = {0, EXIF_IFD_COUNT, 0, 0, NULL, {0, }}; +static const char *ifd_string = NULL, *tag_string = NULL; +static ExifParams p = {0, EXIF_IFD_COUNT, 0, 0, NULL, NULL, NULL}; +LogArg log_arg = {0, 0, 0}; int main (int argc, const char **argv) @@ -321,11 +169,10 @@ main (int argc, const char **argv) /* POPT_ARG_NONE needs an int, not char! */ poptContext ctx; const char **args, *output = NULL; - const char *ithumbnail = NULL; const struct poptOption options[] = { POPT_AUTOHELP - {"version", 'v', POPT_ARG_NONE, &show_version, 0, - N_("Display software version"), NULL}, + {"version", 'v', POPT_ARG_NONE, &show_version, 0, + N_("Display software version"), NULL}, {"ids", 'i', POPT_ARG_NONE, &p.use_ids, 0, N_("Show IDs instead of tag names"), NULL}, {"tag", 't', POPT_ARG_STRING, &tag_string, 0, @@ -342,31 +189,32 @@ main (int argc, const char **argv) N_("Show description of tag"), NULL}, {"extract-thumbnail", 'e', POPT_ARG_NONE, &extract_thumbnail, 0, N_("Extract thumbnail"), NULL}, - {"remove-thumbnail", 'r', POPT_ARG_NONE, &remove_thumbnail, 0, + {"remove-thumbnail", 'r', POPT_ARG_NONE, &remove_thumb, 0, N_("Remove thumbnail"), NULL}, - {"insert-thumbnail", 'n', POPT_ARG_STRING, &ithumbnail, 0, + {"insert-thumbnail", 'n', POPT_ARG_STRING, &p.set_thumb, 0, N_("Insert FILE as thumbnail"), N_("FILE")}, {"output", 'o', POPT_ARG_STRING, &output, 0, N_("Write data to FILE"), N_("FILE")}, - {"set-value", '\0', POPT_ARG_STRING, &set_value, 0, + {"set-value", '\0', POPT_ARG_STRING, &p.set_value, 0, N_("Value"), NULL}, + {"create-exif", 'c', POPT_ARG_NONE, &create_exif, 0, + N_("Create EXIF data if not existing"), NULL}, {"machine-readable", 'm', POPT_ARG_NONE, &p.machine_readable, 0, N_("Output in a machine-readable (tab delimited) format"), NULL}, {"xml-output", 'x', POPT_ARG_NONE, &xml_output, 0, N_("Output in a XML format"), NULL}, - {"debug", 'd', POPT_ARG_NONE, &debug, 0, + {"debug", 'd', POPT_ARG_NONE, &log_arg.debug, 0, N_("Show debugging messages"), NULL}, POPT_TABLEEND}; ExifData *ed; - ExifEntry *e; - FILE *f; ExifLog *log = NULL; + char fout[1024] = {0, }; #ifdef ENABLE_GLIBC_MEMDEBUG - mcheck(NULL); - mtrace(); + mcheck (NULL); + mtrace (); #endif #ifdef ENABLE_NLS @@ -379,59 +227,57 @@ main (int argc, const char **argv) ctx = poptGetContext (PACKAGE, argc, argv, options, 0); poptSetOtherOptionHelp (ctx, _("[OPTION...] file")); - while (poptGetNextOpt (ctx) > 0) - ; - - /* Any command line parameters ? */ - if (argc <= 1) { - poptPrintHelp (ctx, stdout, 0); - poptFreeContext(ctx); - return (1); - } + while (poptGetNextOpt (ctx) > 0); - /* - * When debugging, continue as far as possible. If not, make all errors - * fatal. - */ log = exif_log_new (); - exif_log_set_func (log, debug ? log_func : log_func_exit, NULL); - - if (show_version) { - printf ("%s\n", VERSION); - exif_log_free(log); - poptFreeContext(ctx); - return 0; - } + exif_log_set_func (log, log_func, &log_arg); /* Identify the parameters */ if (ifd_string) { p.ifd = exif_ifd_from_string (ifd_string); if ((p.ifd < EXIF_IFD_0) || (p.ifd >= EXIF_IFD_COUNT) || - !exif_ifd_get_name (p.ifd)) + !exif_ifd_get_name (p.ifd)) { exif_log (log, -1, "exif", _("Invalid IFD '%s'. Valid IFDs are " "'0', '1', 'EXIF', 'GPS', and " "'Interoperability'."), ifd_string); + return 1; + } } if (tag_string) { p.tag = exif_tag_from_string (tag_string); if (p.tag == 0xffff) { exif_log (log, -1, "exif", _("Invalid tag '%s'!"), tag_string); - p.tag = 0; + return 1; } } - memset (p.fout, 0, sizeof (p.fout)); - if (output) - strncpy (p.fout, output, sizeof (p.fout) - 1); /* Check for all necessary parameters */ - if (!p.tag && (set_value || show_description)) - exif_log (log, -1, "exif", _("You need to specify a tag!")); + if (!p.tag && (p.set_value || show_description)) { + exif_log (log, -1, "exif", _("You need to specify a tag!")); + return 1; + } if (((p.ifd < EXIF_IFD_0) || (p.ifd >= EXIF_IFD_COUNT)) && - (set_value || remove_tag)) + (p.set_value || remove_tag || show_description)) { exif_log (log, -1, "exif", _("You need to specify an IFD!")); + return 1; + } + + /* No command: Show help */ + if (argc <= 1) { + poptPrintHelp (ctx, stdout, 0); + poptFreeContext(ctx); + return (1); + } + /* Commands not related to file. You can only specify one. */ + if (show_version) { + printf ("%s\n", VERSION); + exif_log_free (log); + poptFreeContext (ctx); + return 0; + } if (show_description) { /* * The C() macro can point to a static buffer so these printfs @@ -444,166 +290,92 @@ main (int argc, const char **argv) printf ("%s\n", C(exif_tag_get_description_in_ifd (p.tag, p.ifd))); - exif_log_free(log); - poptFreeContext(ctx); - return (0); + exif_log_free (log); + poptFreeContext (ctx); + return 0; } - args = poptGetArgs (ctx); - - if (args) { - while (*args) { - ExifLoader *l; + /* Commands related to files */ + if (!((args = poptGetArgs (ctx)))) { + poptPrintHelp (ctx, stdout, 0); + exif_log_free (log); + poptFreeContext (ctx); + return 1; + } + while (*args) { + ExifLoader *l; - /* Identify the parameters */ - if (!output) { - strncpy (p.fout, *args, sizeof (p.fout) - 1); - strncat (p.fout, ".modified.jpeg", - sizeof (p.fout) - 1); - } - p.fin = *args; + /* Identify the parameters */ + if (output) + strncpy (fout, output, sizeof (fout) - 1); + else { + strncpy (fout, *args, sizeof (fout) - 1); + strncat (fout, ".modified.jpeg", + sizeof (fout) - 1); + } + p.fin = *args; - /* - * Try to read EXIF data from the file. - * If there is no EXIF data, exit. - */ - l = exif_loader_new (); - exif_loader_log (l, log); - exif_loader_write_file (l, *args); - ed = exif_loader_get_data (l); - exif_loader_unref (l); - if (!ed || ! (ed->data || ed->size || - ed->ifd[EXIF_IFD_0]->count || - ed->ifd[EXIF_IFD_1]->count || - ed->ifd[EXIF_IFD_EXIF]->count || - ed->ifd[EXIF_IFD_GPS]->count || - ed->ifd[EXIF_IFD_INTEROPERABILITY]->count)) { + /* + * Try to read EXIF data from the file. + * If there is no EXIF data, create it if the user + * told us to do so. + */ + l = exif_loader_new (); + exif_loader_log (l, log); + if (create_exif) + log_arg.ignore_corrupted = 1; + exif_loader_write_file (l, *args); + log_arg.ignore_corrupted = 0; + if (!log_arg.corrupted) + create_exif = 0; + ed = exif_loader_get_data (l); + exif_loader_unref (l); + if (!ed) { + if (create_exif) { + ed = exif_data_new (); + exif_data_log (ed, log); + } else { exif_log (log, -1, "exif", _("'%s' does not " - "contain EXIF data!"), *args); - /* Never gets here--exif_log has exit()ed */ + "contain EXIF data!"), *args); + return 1; } + } - if (list_tags) { - action_tag_table (ed, p); - - } else if (p.tag && !set_value && !remove_tag) { - action_show_tag (ed, log, p); - - } else if (extract_thumbnail) { - action_extract_thumb (ed, log, p); - - } else if (remove_thumbnail) { - - /* Get rid of the thumbnail */ - if (ed->data) { - free (ed->data); - ed->data = NULL; - } - ed->size = 0; - - /* Save the new data. */ - save_exif_data_to_file (ed, log, p); - - } else if (ithumbnail) { - - /* Get rid of the old thumbnail */ - if (ed->data) { - free (ed->data); - ed->data = NULL; - } - ed->size = 0; - - /* Insert new thumbnail */ - f = fopen (ithumbnail, "rb"); - if (!f) -#ifdef __GNUC__ - exif_log (log, -1, "exif", _("Could not open " - "'%s' (%m)!"), ithumbnail); -#else - exif_log (log, -1, "exif", _("Could not open " - "'%s' (%s)!"), ithumbnail, - strerror (errno)); -#endif - fseek (f, 0, SEEK_END); - ed->size = ftell (f); - ed->data = malloc (sizeof (char) * ed->size); - if (ed->size && !ed->data) EXIF_LOG_NO_MEMORY (log, "exif", ed->size); - fseek (f, 0, SEEK_SET); - if (fread (ed->data, sizeof (char), - ed->size, f) != ed->size) -#ifdef __GNUC__ - exif_log (log, -1, "exif", _("Could not read " - "'%s' (%m)."), ithumbnail); -#else - exif_log (log, -1, "exif", _("Could not read " - "'%s' (%s)."), ithumbnail, - strerror (errno)); -#endif - fclose (f); - - save_exif_data_to_file (ed, log, p); - - } else if (set_value) { - - /* If the entry doesn't exist, create it. */ - e = exif_content_get_entry (ed->ifd[p.ifd], p.tag); - if (!e) { - e = exif_entry_new (); - exif_content_add_entry (ed->ifd[p.ifd], e); - exif_entry_initialize (e, p.tag); - } - - /* Now set the value and save the data. */ - convert_arg_to_entry (set_value, e, - exif_data_get_byte_order (ed)); - save_exif_data_to_file (ed, log, p); - - } else if (remove_tag) { - - if (!p.tag) { - while (ed->ifd[p.ifd] && - ed->ifd[p.ifd]->count) - exif_content_remove_entry ( - ed->ifd[p.ifd], - ed->ifd[p.ifd]->entries[0]); - } else { - e = exif_content_get_entry ( - ed->ifd[p.ifd], p.tag); - if (!e) - exif_log (log, -1, "exif", _("IFD '%s' does not contain a " - "tag '%s'!"), - exif_ifd_get_name (p.ifd), - exif_tag_get_name_in_ifd (p.tag, p.ifd)); - exif_content_remove_entry (ed->ifd[p.ifd], e); - } - - /* Save modified data. */ - save_exif_data_to_file (ed, log, p); - - } else if (p.machine_readable) { - action_tag_list_machine (ed, p); - - } else if (xml_output) { - action_tag_list_xml (ed, p); - - } else if (list_mnote) { - action_mnote_list (ed, p); + if (list_tags) + action_tag_table (ed, p); + else if (p.tag && !p.set_value && !remove_tag) + action_show_tag (ed, log, p); + else if (extract_thumbnail) + action_save_thumb (ed, log, p, fout); + else if (remove_thumb) + action_remove_thumb (ed, log, p); + else if (p.set_thumb) + action_insert_thumb (ed, log, p); + else if (p.set_value) + action_set_value (ed, log, p); + else if (remove_tag) + action_remove_tag (ed, log, p); + else if (p.machine_readable) + action_tag_list_machine (ed, p); + else if (xml_output) + action_tag_list_xml (ed, p); + else if (list_mnote) + action_mnote_list (ed, p); + else if (create_exif) + /* Nothing here. Data will be saved later. */ + ; + else + action_tag_list (ed, p); - } else - action_tag_list (ed, p); + if (create_exif || p.set_thumb || remove_tag || remove_thumb) + action_save (ed, log, p, fout); - exif_data_unref (ed); - args++; - } - } else { - poptPrintHelp (ctx, stdout, 0); - exif_log_free(log); - poptFreeContext(ctx); - return(1); + exif_data_unref (ed); + args++; } - exif_log_free(log); + exif_log_free (log); poptFreeContext (ctx); - return (0); + return 0; } Index: actions.c =================================================================== RCS file: /cvsroot/libexif/exif/exif/actions.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -p -d -r1.31 -r1.32 --- actions.c 17 Feb 2008 11:49:03 -0000 1.31 +++ actions.c 17 Feb 2008 18:17:08 -0000 1.32 @@ -21,6 +21,7 @@ #include "config.h" #include "actions.h" #include "exif-i18n.h" +#include "libjpeg/jpeg-data.h" #include <stdio.h> #include <stdlib.h> @@ -34,6 +35,147 @@ #define CN(s) ((s) ? (s) : "(NULL)") static void +convert_arg_to_entry (const char *set_value, ExifEntry *e, ExifByteOrder o, ExifLog *log) +{ + unsigned int i, numcomponents; + char *value_p; + + /* + * ASCII strings are handled separately, + * since they don't require any conversion. + */ + if (e->format == EXIF_FORMAT_ASCII) { + if (e->data) free (e->data); + e->components = strlen (set_value) + 1; + e->size = sizeof (char) * e->components; + e->data = malloc (e->size); + if (!e->data) { + fprintf (stderr, _("Not enough memory.")); + fputc ('\n', stderr); + exit (1); + } + strcpy ((char *) e->data, (char *) set_value); + return; + } + + /* + * Make sure we can handle this entry + */ + if ((e->components == 0) && *set_value) { + fprintf (stderr, _("Setting a value for this tag " + "is unsupported!")); + fputc ('\n', stderr); + exit (1); + } + + value_p = (char*) set_value; + numcomponents = e->components; + for (i = 0; i < numcomponents; ++i) { + const char *begin, *end; + unsigned char *buf, s; + static const char comp_separ = ' '; + + begin = value_p; + value_p = strchr (begin, comp_separ); + if (!value_p) { + if (i != numcomponents - 1) { + fprintf (stderr, _("Too few components " + "specified!")); + fputc ('\n', stderr); + exit (1); + } + end = begin + strlen (begin); + } else end = value_p++; + + buf = malloc ((end - begin + 1) * sizeof (char)); + strncpy ((char *) buf, (char *) begin, end - begin); + buf[end - begin] = '\0'; + + s = exif_format_get_size (e->format); + switch (e->format) { + case EXIF_FORMAT_ASCII: + exif_log (log, -1, "exif", _("Internal error. " + "Please contact <%s>."), PACKAGE_BUGREPORT); + break; + case EXIF_FORMAT_SHORT: + exif_set_short (e->data + (s * i), o, atoi ((char *) buf)); + break; + case EXIF_FORMAT_SSHORT: + exif_set_sshort (e->data + (s * i), o, atoi ((char *) buf)); + break; + case EXIF_FORMAT_RATIONAL: + /* + * Hack to simplify the loop for rational numbers. + * Should really be using exif_set_rational instead + */ + if (i == 0) numcomponents *= 2; + s /= 2; + /* Fall through to LONG handler */ + case EXIF_FORMAT_LONG: + exif_set_long (e->data + (s * i), o, atol ((char *) buf)); + break; + case EXIF_FORMAT_SRATIONAL: + /* + * Hack to simplify the loop for rational numbers. + * Should really be using exif_set_srational instead + */ + if (i == 0) numcomponents *= 2; + s /= 2; + /* Fall through to SLONG handler */ + case EXIF_FORMAT_SLONG: + exif_set_slong (e->data + (s * i), o, atol ((char *) buf)); + break; + case EXIF_FORMAT_BYTE: + case EXIF_FORMAT_SBYTE: + case EXIF_FORMAT_FLOAT: + case EXIF_FORMAT_DOUBLE: + case EXIF_FORMAT_UNDEFINED: + default: + fprintf (stderr, _("Not yet implemented!")); + fputc ('\n', stderr); + exit (1); + } + free (buf); + } + if (value_p && *value_p) { + fprintf (stderr, _("Warning; Too many components specified!")); + fputc ('\n', stderr); + } +} + +void +action_save (ExifData *ed, ExifLog *log, ExifParams p, const char *fout) +{ + JPEGData *jdata; + unsigned char *d = NULL; + unsigned int ds; + + /* Parse the JPEG file. */ + jdata = jpeg_data_new (); + jpeg_data_log (jdata, log); + jpeg_data_load_file (jdata, p.fin); + + /* Make sure the EXIF data is not too big. */ + exif_data_save_data (ed, &d, &ds); + if (ds) { + free (d); + if (ds > 0xffff) + exif_log (log, -1, "exif", _("Too much EXIF data " + "(%i bytes). Only %i bytes are allowed."), + ds, 0xffff); + }; + + jpeg_data_set_exif_data (jdata, ed); + + /* Save the modified image. */ + jpeg_data_save_file (jdata, fout); + jpeg_data_unref (jdata); + + fprintf (stdout, _("Wrote file '%s'."), fout); + fprintf (stdout, "\n"); +} + +static void show_entry (ExifEntry *entry, unsigned int machine_readable) { ExifIfd ifd = exif_entry_get_ifd (entry); @@ -61,6 +203,88 @@ show_entry (ExifEntry *entry, unsigned i } void +action_set_value (ExifData *ed, ExifLog *log, ExifParams p) +{ + ExifEntry *e; + + /* If the entry doesn't exist, create it. */ + if (!((e = exif_content_get_entry (ed->ifd[p.ifd], p.tag)))) { + e = exif_entry_new (); + exif_content_add_entry (ed->ifd[p.ifd], e); + exif_entry_initialize (e, p.tag); + } + + /* Now set the value and save the data. */ + convert_arg_to_entry (p.set_value, e, exif_data_get_byte_order (ed), log); +} + +void +action_remove_tag (ExifData *ed, ExifLog *log, ExifParams p) +{ + ExifEntry *e; + + if (!p.tag) { + while (ed->ifd[p.ifd] && ed->ifd[p.ifd]->count) + exif_content_remove_entry ( + ed->ifd[p.ifd], + ed->ifd[p.ifd]->entries[0]); + } else { + if (!((e = exif_content_get_entry (ed->ifd[p.ifd], p.tag)))) + exif_log (log, -1, "exif", _("IFD '%s' does not contain a " + "tag '%s'!"), exif_ifd_get_name (p.ifd), + exif_tag_get_name_in_ifd (p.tag, p.ifd)); + else + exif_content_remove_entry (ed->ifd[p.ifd], e); + } +} + +void +action_remove_thumb (ExifData *ed, ExifLog *log, ExifParams p) +{ + if (ed->data) { + free (ed->data); + ed->data = NULL; + } + ed->size = 0; +} + +void +action_insert_thumb (ExifData *ed, ExifLog *log, ExifParams p) +{ + FILE *f; + + if (!ed) return; + + /* Get rid of the thumbnail */ + action_remove_thumb (ed, log, p); + + /* Insert new thumbnail */ + f = fopen (p.set_thumb, "rb"); + if (!f) +#ifdef __GNUC__ + exif_log (log, -1, "exif", _("Could not open " + "'%s' (%m)!"), p.set_thumb); +#else + exif_log (log, -1, "exif", _("Could not open " + "'%s' (%s)!"), p.set_thumb, strerror (errno)); +#endif + fseek (f, 0, SEEK_END); + ed->size = ftell (f); + ed->data = malloc (sizeof (char) * ed->size); + if (ed->size && !ed->data) EXIF_LOG_NO_MEMORY (log, "exif", ed->size); + fseek (f, 0, SEEK_SET); + if (fread (ed->data, sizeof (char), ed->size, f) != ed->size) +#ifdef __GNUC__ + exif_log (log, -1, "exif", _("Could not read " + "'%s' (%m)."), p.set_thumb); +#else + exif_log (log, -1, "exif", _("Could not read " + "'%s' (%s)."), p.set_thumb, strerror (errno)); +#endif + fclose (f); +} + +void action_show_tag (ExifData *ed, ExifLog *log, ExifParams p) { ExifEntry *e; @@ -84,7 +308,7 @@ action_show_tag (ExifData *ed, ExifLog * } void -action_extract_thumb (ExifData *ed, ExifLog *log, ExifParams p) +action_save_thumb (ExifData *ed, ExifLog *log, ExifParams p, const char *fout) { FILE *f; @@ -98,18 +322,18 @@ action_extract_thumb (ExifData *ed, Exif } /* Save the thumbnail */ - f = fopen (p.fout, "wb"); + f = fopen (fout, "wb"); if (!f) #ifdef __GNUC__ exif_log (log, -1, "exif", _("Could not open '%s' for " - "writing (%m)!"), p.fout); + "writing (%m)!"), fout); #else exif_log (log, -1, "exif", _("Could not open '%s' for " - "writing (%s)!"), p.fout, strerror (errno)); + "writing (%s)!"), fout, strerror (errno)); #endif fwrite (ed->data, 1, ed->size, f); fclose (f); - fprintf (stdout, _("Wrote file '%s'."), p.fout); + fprintf (stdout, _("Wrote file '%s'."), fout); fprintf (stdout, "\n"); } Index: actions.h =================================================================== RCS file: /cvsroot/libexif/exif/exif/actions.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -d -r1.9 -r1.10 --- actions.h 17 Feb 2008 11:49:04 -0000 1.9 +++ actions.h 17 Feb 2008 18:17:08 -0000 1.10 @@ -31,11 +31,19 @@ typedef struct { unsigned int use_ids; const char *fin; - char fout[1024]; + + const char *set_value; + const char *set_thumb; } ExifParams; -void action_extract_thumb (ExifData *, ExifLog *, ExifParams); +void action_insert_thumb (ExifData *, ExifLog *, ExifParams); +void action_remove_thumb (ExifData *, ExifLog *, ExifParams); void action_show_tag (ExifData *, ExifLog *, ExifParams); +void action_set_value (ExifData *, ExifLog *, ExifParams); +void action_remove_tag (ExifData *, ExifLog *, ExifParams); + +void action_save (ExifData *, ExifLog *, ExifParams, const char *); +void action_save_thumb (ExifData *, ExifLog *, ExifParams, const char *); void action_tag_table (ExifData *, ExifParams); void action_tag_list (ExifData *, ExifParams); |
