fix packages and add opts4

Author: BenJacobsen

docker/Dockerfile

@@ -42,10 +42,10 @@ RUN apt-get update \
       libopencv-dev \
       curl \
       zstd \
-      dlib \
-      pyamg
+      build-essential \
+      cmake
 
-RUN pip3 install scikit-image opencv-python numpy Pillow --break-system-packages
+RUN pip3 install scikit-image==0.22.0 scipy==1.11.4 opencv-python numpy Pillow dlib==19.24.4 pyamg --break-system-packages
 
 COPY plugins/pushd-dither /opt/pushd-dither/
 

options/processing_options.go

@@ -83,6 +83,7 @@ type DitherOptions struct {
 	OptionsSet01      bool // shorthand sets
 	OptionsSet02      bool
 	OptionsSet03      bool
+	OptionsSet04      bool
 	OptionsSetCam16   bool
 	OptionsSetHpminde bool
 	OptionsSetScam    bool
@@ -779,6 +780,8 @@ func applyDitherOption(po *ProcessingOptions, args []string) error {
 				po.Dither.OptionsSet02 = true // shorthand for a set of options starting with the 20240510 release
 			case "opts03":
 				po.Dither.OptionsSet03 = true // shorthand for a set of options starting with the 20240702 release
+			case "opts04":
+				po.Dither.OptionsSet04 = true // shorthand for a set of options starting with the 20240809 release
 			case "optscam16":
 				po.Dither.OptionsSetCam16 = true
 			case "optshpminde":

processing/dither.go

@@ -241,6 +241,15 @@ func shellOutDither(inFile string, po *options.ProcessingOptions) error {
 		cmdArgs = append(cmdArgs, "--shrink-gamut", "1.1")
 		cmdArgs = append(cmdArgs, "--saturation-scale", "1.0")
 		cmdArgs = append(cmdArgs, "--clip-error")
+	case po.Dither.OptionsSet04:
+		cmdArgs = append(cmdArgs, "--jzazbz")
+		cmdArgs = append(cmdArgs, "--map-palette", "pal_inflate_extra")
+		cmdArgs = append(cmdArgs, "--pal-inflate")
+		cmdArgs = append(cmdArgs, "--chroma-lightness")
+		cmdArgs = append(cmdArgs, "--shrink-gamut", "1.1")
+		cmdArgs = append(cmdArgs, "--saturation-scale", "1.0")
+		cmdArgs = append(cmdArgs, "--clip-error")
+		cmdArgs = append(cmdArgs, "--auto-enhance")
 	case po.Dither.OptionsSetCam16:
 		cmdArgs = append(cmdArgs, "--cam16")
 		cmdArgs = append(cmdArgs, "--chroma-lightness")