From ee202873edb0d236e03270b96504e58b4664bd8b Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Tue, 16 Aug 2022 01:14:05 +0000
Subject: Update internal use of 'pamcat' to adapt to its new ability to
 produce PNM output

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4411 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 editor/pnmmargin            | 5 ++---
 editor/pnmquantall          | 3 +--
 editor/specialty/pnmindex.c | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'editor')

diff --git a/editor/pnmmargin b/editor/pnmmargin
index 01dfdecc..94321c7f 100755
--- a/editor/pnmmargin
+++ b/editor/pnmmargin
@@ -108,9 +108,8 @@ else
     pamflip -rotate90 $tmp2 > $tmp3
 
     # Cat things together.
-    pamcat -extendplane -leftright $tmp2 $tmp1 $tmp2 > $tmp4
-    pamcat -extendplane -topbottom $tmp3 $tmp4 $tmp3 | \
-      pamtopnm $plainopt
+    pamcat -leftright $tmp2 $tmp1 $tmp2 > $tmp4
+    pamcat -topbottom $plainopt $tmp3 $tmp4 $tmp3
 fi
 
 
diff --git a/editor/pnmquantall b/editor/pnmquantall
index f18852a1..594e8f7b 100755
--- a/editor/pnmquantall
+++ b/editor/pnmquantall
@@ -145,8 +145,7 @@ sub tempFile($) {
 sub makeColorMap($$$$) {
     my ($fileNamesR, $newColorCt, $colorMapFileName, $errorR) = @_;
 
-    my $pamcatCmd =
-       "pamcat -extendplane -topbottom -white -jleft @{$fileNamesR}";
+    my $pamcatCmd = "pamcat -topbottom -white -jleft @{$fileNamesR}";
 
     my $pnmcolormapCmd = "pnmcolormap $newColorCt";
 
diff --git a/editor/specialty/pnmindex.c b/editor/specialty/pnmindex.c
index 4b8dafd6..2b39e4ec 100644
--- a/editor/specialty/pnmindex.c
+++ b/editor/specialty/pnmindex.c
@@ -502,7 +502,7 @@ makeImageFile(const char * const thumbnailFileName,
     const char * inputFileNmToken    = shellQuote(inputFileName);
 
     systemf("pbmtext %s %s"
-            "| pamcat -extendplane %s -topbottom %s - "
+            "| pamcat %s -topbottom %s - "
             "> %s",
             inputFileNmToken, invertStage, blackWhiteOpt,
             thumbnailFileName, outputFileName);
@@ -616,7 +616,7 @@ combineIntoRowAndDelete(unsigned int const row,
 
     fileList = thumbnailFileList(tempDir, row, cols);
 
-    systemf("pamcat -extendplane %s -leftright -jbottom %s "
+    systemf("pamcat %s -leftright -jbottom %s "
             "%s"
             ">%s",
             blackWhiteOpt, fileList, quantStage, fileName);
@@ -683,7 +683,7 @@ writeRowsAndDelete(unsigned int const rows,
 
     fileList = rowFileList(tempDir, rows);
 
-    systemf("pamcat -extendplane %s -topbottom %s | pamtopnm -assume %s",
+    systemf("pamcat %s -topbottom %s %s",
             blackWhiteOpt, fileList, quantStage);
 
     pm_strfree(fileList);
-- 
cgit 1.4.1