about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-12-17 19:55:46 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-12-17 19:55:46 +0000
commit5a2f7ec9aba8e126aba1390ac0791e1195fe7b98 (patch)
tree4cc34a2734b4187100333f8c687254ebe9822255
parent1cf50e505fa1fabdca6295f9661e0528ab5e1d47 (diff)
downloadnetpbm-mirror-5a2f7ec9aba8e126aba1390ac0791e1195fe7b98.tar.gz
netpbm-mirror-5a2f7ec9aba8e126aba1390ac0791e1195fe7b98.tar.xz
netpbm-mirror-5a2f7ec9aba8e126aba1390ac0791e1195fe7b98.zip
Add -plain
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4811 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--doc/HISTORY2
-rw-r--r--editor/specialty/pnmindex.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/HISTORY b/doc/HISTORY
index 2328f6d2..030e2d0f 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -14,6 +14,8 @@ not yet  BJH  Release 11.05.00
               libnetpbm.  (Was fixed in 10.47.08 in November 2010, but only in
               the 10.47 series).
 
+              pnmindex: Make -plain work.
+
               pnmpad: fix behavior with -left, -right, and -width together or
               -top, -bottom, -height together: ignores -width where it should
               fail.  Broken in Netpbm 10.72 (September 2015).
diff --git a/editor/specialty/pnmindex.c b/editor/specialty/pnmindex.c
index 5bde6c54..acd43958 100644
--- a/editor/specialty/pnmindex.c
+++ b/editor/specialty/pnmindex.c
@@ -684,6 +684,7 @@ writeRowsAndDelete(unsigned int const rows,
                    const char * const tempDir) {
 
     const char * const blackWhiteOpt = blackBackground ? "-black" : "-white";
+    const char * const plainOpt      = pm_plain_output ? "-plain" : "";
 
     const char * quantStage;
     const char * fileList;
@@ -697,8 +698,8 @@ writeRowsAndDelete(unsigned int const rows,
 
     fileList = rowFileList(tempDir, rows);
 
-    pm_asprintf(&shellCommand, "pamcat %s -topbottom %s %s",
-                blackWhiteOpt, fileList, quantStage);
+    pm_asprintf(&shellCommand, "pamcat %s %s -topbottom %s %s",
+                plainOpt, blackWhiteOpt, fileList, quantStage);
 
     /* Do pamcat/pnmquant command with no Standard Input and writing to
        our Standard Output