about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-14 16:53:17 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-11-14 16:53:17 +0000
commita09c617ca7c27c506fbba55b3dc93a1b17084ec4 (patch)
treec1c4b72a35a31f901cc414ccd493aecc01934570
parentdfb411eadb846aba73ff8a5fea55e08555459bad (diff)
downloadnetpbm-mirror-a09c617ca7c27c506fbba55b3dc93a1b17084ec4.tar.gz
netpbm-mirror-a09c617ca7c27c506fbba55b3dc93a1b17084ec4.tar.xz
netpbm-mirror-a09c617ca7c27c506fbba55b3dc93a1b17084ec4.zip
Release 10.36.11
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@133 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rw-r--r--converter/ppm/ppmtogif.c2
-rw-r--r--doc/HISTORY4
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version
index 9f959ecb..4e9aae0d 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 36
-NETPBM_POINT_RELEASE = 10
+NETPBM_POINT_RELEASE = 11
 
diff --git a/converter/ppm/ppmtogif.c b/converter/ppm/ppmtogif.c
index 9521237b..d66804d7 100644
--- a/converter/ppm/ppmtogif.c
+++ b/converter/ppm/ppmtogif.c
@@ -383,7 +383,7 @@ ppm_seek(FILE *             const fileP,
                  "Valid sizes are %u and %u", 
                  rasterPosSize, sizeof(pm_filepos), sizeof(long));
 
-    pixelPos = rasterPos + row * cols * bytesPerSample(maxval) + col;
+    pixelPos = rasterPos + row * cols * 3 * bytesPerSample(maxval) + col;
 
     pm_seek2(fileP, &pixelPos, sizeof(pixelPos));
 }
diff --git a/doc/HISTORY b/doc/HISTORY
index 1df7f48c..0e8c1d98 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+06.11.14 BJH  Release 10.36.11
+
+              ppmtogif: fix garbage output with -interlace.
+
 06.11.13 BJH  Release 10.36.10
 
               Configure: fix libX11 location default.