about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--doc/HISTORY6
-rw-r--r--generator/pamstereogram.c1
-rw-r--r--lib/libpam.c2
-rw-r--r--version.mk2
4 files changed, 9 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 215a44c4..16f04d14 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+13.06.27 BJH  Release 10.62.09
+
+              libnetpbm: fix bug: pnm_readpaminit and pnm_writepaminit set
+              'opacity_plane' member of struct pam incorrectly.  No Netpbm
+              programs are affected.
+
 13.06.14 BJH  Release 10.62.08
 
               giftopnm: fix bug: erroneously claims GIF ends prematurely.
diff --git a/generator/pamstereogram.c b/generator/pamstereogram.c
index 6bcababa..15cf1a2c 100644
--- a/generator/pamstereogram.c
+++ b/generator/pamstereogram.c
@@ -43,6 +43,7 @@
  * ----------------------------------------------------------------------
  */
 
+#define _ISOC99_SOURCE  /* Make sure strtof() is in <stdlib.h> */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libpam.c b/lib/libpam.c
index b4aaeb95..549f4c55 100644
--- a/lib/libpam.c
+++ b/lib/libpam.c
@@ -864,7 +864,7 @@ interpretTupleType(struct pam * const pamP) {
     if (pamP->size >= PAM_STRUCT_SIZE(have_opacity))
         pamP->have_opacity = haveOpacity;
     if (pamP->size >= PAM_STRUCT_SIZE(opacity_plane))
-        pamP->have_opacity = haveOpacity;
+        pamP->opacity_plane = opacityPlane;
 }
 
 
diff --git a/version.mk b/version.mk
index 74e571b9..397cdccb 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 62
-NETPBM_POINT_RELEASE = 8
+NETPBM_POINT_RELEASE = 9