about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile.version2
-rw-r--r--doc/HISTORY5
-rw-r--r--editor/pamcomp.c3
3 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version
index 4aa1369a..ec685f2c 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 08
+NETPBM_POINT_RELEASE = 09
diff --git a/doc/HISTORY b/doc/HISTORY
index d8284f97..b3663ad4 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+06.10.21 BJH  Release 10.35.09
+
+              Fix pamcomp: due to use of undefined value, sometimes produces
+              plain format.
+
 06.10.18 BJH  Release 10.35.08
 
               Fix pamperspective: read all of input.
diff --git a/editor/pamcomp.c b/editor/pamcomp.c
index 871267b2..f7346483 100644
--- a/editor/pamcomp.c
+++ b/editor/pamcomp.c
@@ -242,10 +242,11 @@ determineOutputType(struct pam * const composedPamP,
                     struct pam * const overlayPamP) {
 
     composedPamP->height = underlayPamP->height;
-    composedPamP->width = underlayPamP->width;
+    composedPamP->width  = underlayPamP->width;
 
     composedPamP->format = commonFormat(underlayPamP->format, 
                                         overlayPamP->format);
+    composedPamP->plainformat = FALSE;
     commonTupletype(underlayPamP->tuple_type, overlayPamP->tuple_type,
                     composedPamP->tuple_type, 
                     sizeof(composedPamP->tuple_type));