From a32b82dcd7652f10c193fcdb8a6e281ad4eb5192 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@sbcglobal.net>
Date: Fri, 10 Jan 2025 10:38:54 -0800
Subject: [PATCH] Dump additional state

---
 images/apple/PLASMA-2.20.po   | Bin 33553920 -> 33553920 bytes
 src/dhgr.tk/utils/dhgrrgb.pla |  31 +++++++++++++++----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/images/apple/PLASMA-2.20.po b/images/apple/PLASMA-2.20.po
index 2ac23d06a81d30d4a8dbab3cd142faf376ea0094..8543bb647a558f19e8650ff7c05b8939480f3e19 100755
GIT binary patch
delta 3755
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
DnMcFA

delta 4017
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

diff --git a/src/dhgr.tk/utils/dhgrrgb.pla b/src/dhgr.tk/utils/dhgrrgb.pla
index d008dd6..d81b755 100644
--- a/src/dhgr.tk/utils/dhgrrgb.pla
+++ b/src/dhgr.tk/utils/dhgrrgb.pla
@@ -105,7 +105,7 @@ byte[3] gamut  = 128, 128, 128 // Gamut
 byte gamma     = 1 // Gamma correction
 var brightness = 0
 var saturation = 255 // 1.0
-var tint       = 22 // 45/2 deg
+var tint       = 22 // = 45/2 deg
 byte errDiv    = 4
 byte flags     = 0
 var rgbErr // Running color error array
@@ -386,18 +386,7 @@ def rgbInit#0
   res[t_i32] g32
 
   if flags & DUMP_STATE
-    puts("Err Div = "); puti(errDiv); putln
     puts("Gamma = "); puti(sext(gamma)); putln
-    puts("Brightness = "); puti(brightness); putln
-    puts("Saturation = "); puti(saturation); putln
-    puts("Tint  = "); puti(tint); putln
-    puts("Red gamut = "); puti(gamut[RED]); putln
-    puts("Green gamut = "); puti(gamut[GRN]); putln
-    puts("Blue gamut = "); puti(gamut[BLU]); putln
-    puts("Match = ")
-    if flags & MATCH_NEXT; puts("Next\n")
-    elsif flags & MATCH_CYCLE; puts("Current\n")
-    else; puts("Prev\n"); fin
   fin
   when gamma
     is 255 // (i + 1 / i^2) / 2
@@ -487,6 +476,16 @@ def rgbInit#0
   fin
   calcChroma(tint)
   if flags & DUMP_STATE
+    puts("Err Div = "); puti(errDiv); putln
+    puts("Brightness = "); puti(brightness); putln
+    puts("Tint = "); puti(tint); putln
+    puts("Saturation = "); puti(saturation); putln
+    puts("Gamut = ["); puti(gamut[RED]); putc(',')
+    puti(gamut[GRN]); putc(','); puti(gamut[BLU]); puts("]\n")
+    puts("Match = ")
+    if flags & MATCH_NEXT; puts("Next\n")
+    elsif flags & MATCH_CYCLE; puts("Current\n")
+    else; puts("Prev\n"); fin
     puts("Chroma cycle RGB =\n")
     for i = 0 to 3
       putc('[')
@@ -568,14 +567,13 @@ def pnmReadElement(refnum, bufptr)#1
       until fileio:read(refnum, bufptr, 1) <> 1 or ^bufptr <= ' ' or ^lenptr > 32
     fin
   until ^lenptr and ^(lenptr + 1) <> '#' // Repeat until not comment
-  if flags & DUMP_STATE
-    puts(lenptr); putln
-  fin
+  if flags & DUMP_STATE; puts(lenptr); putc(' '); fin
   return lenptr
 end
 
 def pnmVerifyHeader(refnum)#1
   byte[128] buf
+  if flags & DUMP_STATE; puts("PNM = "); fin
   pnmReadElement(refnum, @buf)
   if buf[0] <> 2 and buf[1] <> 'P' and buf[2] <> '6'
     puts("Invalid PNM magic #: "); putc(buf[1]); putc(buf[2]); putln
@@ -593,6 +591,7 @@ def pnmVerifyHeader(refnum)#1
     puts("Depth not 255: "); puts(@buf); putln
     return FALSE
   fin
+  if flags & DUMP_STATE; putln; fin
   return TRUE
 end
 
@@ -704,7 +703,7 @@ def rgbImportExport(rgbfile, dhgrfile)#0
   fin
 end
 
-puts("DHGR RGB converter 1.0\n")
+puts("DHGR RGB converter 1.1\n")
 arg = argNext(argFirst)
 if ^arg
   while ^(arg + 1) == '-'