The Independent JPEG Group's JPEG software v5a

djpeg.c

@@ -24,8 +24,6 @@
  */
 
 #include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
-#define JMAKE_MSG_TABLE
-#include "cderror.h"		/* create message string table */
 #include "jversion.h"		/* for version message */
 
 #include <ctype.h>		/* to declare isupper(),tolower(),isprint() */
@@ -74,6 +72,16 @@
 #endif
 
 
+/* Create the add-on message string table. */
+
+#define JMESSAGE(code,string)	string ,
+
+static const char * const cdjpeg_message_table[] = {
+#include "cderror.h"
+  NULL
+};
+
+
 /*
  * This list defines the known output image formats
  * (not all of which need be supported by a given version).
@@ -545,7 +553,7 @@ main (int argc, char **argv)
   cinfo.err = jpeg_std_error(&jerr);
   jpeg_create_decompress(&cinfo);
   /* Add some application-specific error messages (from cderror.h) */
-  jerr.addon_message_table = addon_message_table;
+  jerr.addon_message_table = cdjpeg_message_table;
   jerr.first_addon_message = JMSG_FIRSTADDONCODE;
   jerr.last_addon_message = JMSG_LASTADDONCODE;
   /* Insert custom COM marker processor. */
@@ -722,6 +730,12 @@ main (int argc, char **argv)
   jpeg_finish_decompress(&cinfo);
   jpeg_destroy_decompress(&cinfo);
 
+  /* Close files, if we opened them */
+  if (input_file != stdin)
+    fclose(input_file);
+  if (output_file != stdout)
+    fclose(output_file);
+
 #ifdef PROGRESS_REPORT
   /* Clear away progress display */
   if (jerr.trace_level == 0) {