Release 10.47.42

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

3 files changed, 5 insertions, 5 deletions

diff --git a/converter/other/pamtompfont.c b/converter/other/pamtompfont.c
index f755dfef..ba170fef 100644
--- a/converter/other/pamtompfont.c
+++ b/converter/other/pamtompfont.c
@@ -53,6 +53,8 @@ parseCommandLine(int argc, char ** argv,
 
     option_def_index = 0;   /* incremented by OPTENTRY */
 
+    OPTENTINIT;
+
     opt.opt_table = option_def;
     opt.short_allowed = FALSE;  /* We have no short (old-fashioned) options */
     opt.allowNegNum = FALSE;  /* We have no parms that are negative numbers */
diff --git a/converter/other/pamtotiff.c b/converter/other/pamtotiff.c
index 9fac4b47..1b31c65b 100644
--- a/converter/other/pamtotiff.c
+++ b/converter/other/pamtotiff.c
@@ -126,9 +126,6 @@ validateTagList(struct optNameValue const taglist[]) {
             case TIFFTAG_ROWSPERSTRIP:
             case TIFFTAG_PLANARCONFIG:
             case TIFFTAG_COLORMAP:
-            case TIFFTAG_RESOLUTIONUNIT:
-            case TIFFTAG_XRESOLUTION:
-            case TIFFTAG_YRESOLUTION:
                 pm_error("You cannot specify a '%s' tag with -tag.  "
                          "Pamtotiff controls that internally or via other "
                          "options.", tagName);
diff --git a/converter/pbm/xbmtopbm.c b/converter/pbm/xbmtopbm.c
index 135b79f1..9505ba67 100644
--- a/converter/pbm/xbmtopbm.c
+++ b/converter/pbm/xbmtopbm.c
@@ -364,13 +364,14 @@ main(int    argc,
             bitrow[i] = bitreverse[*p++];
             
         if (cols % 8 > 0) {
-            bitrow[bytesPerRow] >>= 8 - cols % 8;
-            bitrow[bytesPerRow] <<= 8 - cols % 8;
+            bitrow[bytesPerRow-1] >>= 8 - cols % 8;
+            bitrow[bytesPerRow-1] <<= 8 - cols % 8;
         }
             
         pbm_writepbmrow_packed(stdout, bitrow, cols, 0);
     }
 
+    pbm_freerow(bitrow);
     free(data);
     pm_close(stdout);