Release 10.35.40

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@596 9d0c8265-081b-0410-96cb-a4ca84ce46f8

6 files changed, 35 insertions, 14 deletions

diff --git a/Makefile.version b/Makefile.version
index 53dbf595..6f3fa189 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 39
+NETPBM_POINT_RELEASE = 40
diff --git a/converter/other/pamtosvg/pamtosvg.c b/converter/other/pamtosvg/pamtosvg.c
index 84d67948..7262204c 100644
--- a/converter/other/pamtosvg/pamtosvg.c
+++ b/converter/other/pamtosvg/pamtosvg.c
@@ -327,11 +327,24 @@ filenameRoot(const char * const filename) {
 
 static void
 openLogFile(FILE **      const logFileP,
-            const char * const inputRootName) {
+            const char * const inputFileArg) {
 
     const char * logfileName;
 
-    asprintfN(&logfileName, "%s.log", inputRootName);
+    if (streq(inputFileArg, "-"))
+        asprintfN(&logfileName, "pamtosvg.log");
+    else {
+        const char * inputRootName;
+
+        inputRootName = filenameRoot(inputFileArg);
+        if (inputRootName == NULL)
+            pm_error("Can't find the root portion of file name '%s'",
+                     inputFileArg);
+    
+        asprintfN(&logfileName, "%s.log", inputRootName);
+
+        strfree(inputRootName);
+    }
 
     *logFileP = pm_openw(logfileName);
 
@@ -348,7 +361,6 @@ main(int argc, char * argv[]) {
     at_bitmap_type * bitmapP;
     at_spline_list_array_type * splinesP;
     at_progress_func progressReporter;
-    const char * inputRootName;
 
     pnm_init(&argc, argv);
 
@@ -356,13 +368,8 @@ main(int argc, char * argv[]) {
 
     ifP = pm_openr(cmdline.inputFileName);
 
-    inputRootName = filenameRoot(cmdline.inputFileName);
-    if (inputRootName == NULL)
-        pm_error("Can't find the root portion of file name '%s'",
-                 cmdline.inputFileName);
-    
     if (cmdline.log)
-        openLogFile(&log_file, inputRootName);
+        openLogFile(&log_file, cmdline.inputFileName);
 
     readImageToBitmap(ifP, &bitmapP);
     
@@ -378,8 +385,6 @@ main(int argc, char * argv[]) {
     writeSplines(splinesP, cmdline, output_svg_writer, stdout,
                  exceptionHandler);
 
-    strfree(inputRootName);
-
     pm_close(stdout);
     pm_close(ifP);
     if (cmdline.log)
diff --git a/doc/HISTORY b/doc/HISTORY
index 05445299..71add4be 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,16 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+08.03.08 BJH  Release 10.35.40
+
+              pgmdeshadow: fix crash in option processing.
+
+              pgmmedian: fix crash.
+
+              pgmbentley: fix output; black areas not black.
+
+              pamtosvg: fix log file name with Standard Input.
+              
 08.02.22 BJH  Release 10.35.39
 
               pamtosvg: fix crash with -centerline.
diff --git a/editor/pgmbentley.c b/editor/pgmbentley.c
index 9cc86a91..a008ed84 100644
--- a/editor/pgmbentley.c
+++ b/editor/pgmbentley.c
@@ -47,6 +47,10 @@ main( argc, argv )
     gout = pgm_allocarray( cols, rows );
 
 #define N 4
+    for (row = 0; row < rows; ++row)
+        for (col = 0; col < cols; ++col)
+            gout[row][col] = 0;
+
     for ( row = 0; row < rows; ++row )
 	for ( col = 0; col < cols; ++col )
 	    {
diff --git a/editor/pgmdeshadow.c b/editor/pgmdeshadow.c
index 482c6661..05eda944 100644
--- a/editor/pgmdeshadow.c
+++ b/editor/pgmdeshadow.c
@@ -85,6 +85,8 @@ parseCommandLine(int argc, char ** argv,
 
     option_def_index = 0;   /* incremented by OPTENT3 */
 
+    option_def[0].type = OPT_END;
+
     opt.opt_table = option_def;
     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
     opt.allowNegNum = FALSE;  /* We may have parms that are negative numbers */
diff --git a/editor/pgmmedian.c b/editor/pgmmedian.c
index 5878b1e7..65d2eeb0 100644
--- a/editor/pgmmedian.c
+++ b/editor/pgmmedian.c
@@ -411,7 +411,7 @@ main(int    argc,
     grayrow = pgm_allocrow(cols);
 
     /* Allocate pointers to mask row buffer. */
-    rowptr = pgm_allocarray(1, cmdline.height);
+    rowptr = (gray **) pm_allocrow(cmdline.height, sizeof(gray *));
 
     /* Read in and write out initial rows that won't get changed. */
     for (row = 0; row < cmdline.height - 1; ++row) {
@@ -450,7 +450,7 @@ main(int    argc,
 
     pgm_freearray(grays, cmdline.height);
     pgm_freerow(grayrow);
-    pgm_freearray(rowptr, cmdline.height);
+    pm_freerow(rowptr);
 
     return 0;
 }