image_pack 0.2.6 → 0.2.7

data/lib/image_pack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImagePack
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/lib/image_pack.rb

@@ -31,8 +31,15 @@ module ImagePack
   ALGOS = %i[jpeg_turbo mozjpeg fast size].freeze
   ALGO_TO_NATIVE = { jpeg_turbo: :jpeg_turbo, mozjpeg: :mozjpeg, fast: :jpeg_turbo, size: :mozjpeg }.freeze
   EXECUTION_MODES = %i[direct nogvl offload auto].freeze
+  SUBSAMPLING_MODES = %i[auto 420 422 444].freeze
+  TUNE_MODES = %i[hvs ssim ms_ssim psnr].freeze
+  EFFORT_MODES = %i[default fast max].freeze
+  SUBSAMPLING_TO_NATIVE = { auto: 0, "420": 1, "422": 2, "444": 3 }.freeze
+  TUNE_TO_NATIVE = { hvs: 0, ssim: 1, ms_ssim: 2, psnr: 3 }.freeze
+  EFFORT_TO_NATIVE = { default: 0, fast: 1, max: 2 }.freeze
   DEFAULT_QUALITY = 82
   DEFAULT_ALGO = :mozjpeg
+  AUTO_444_QUALITY = 90
 
   class << self
     def configuration
@@ -59,6 +66,15 @@ module ImagePack
       defined?(NATIVE_OFFLOAD_SAFE) && NATIVE_OFFLOAD_SAFE == true
     end
 
+    def warn_if_scalar!
+      return if !defined?(NATIVE_SIMD) || NATIVE_SIMD
+      return if @scalar_warned
+
+      @scalar_warned = true
+      warn "ImagePack: this native build is scalar (no SIMD). On x86_64 install nasm " \
+           "and reinstall the gem for ~3-4x faster JPEG encode/decode."
+    end
+
     def compress_bytes(bytes, **options)
       raise InvalidArgumentError, "bytes must be a String" unless bytes.is_a?(String)
 
@@ -89,11 +105,16 @@ module ImagePack
                       output: nil,
                       progressive: true,
                       strip_metadata: false,
+                      strip_icc: false,
+                      trim: false,
                       execution: nil,
                       cancellable: false,
                       strict: false)
+      warn_if_scalar!
       validate_boolean!(:progressive, progressive)
       validate_boolean!(:strip_metadata, strip_metadata)
+      validate_boolean!(:strip_icc, strip_icc)
+      validate_boolean!(:trim, trim)
       validate_boolean!(:cancellable, cancellable)
       validate_boolean!(:strict, strict)
       execution ||= configuration.execution
@@ -112,7 +133,9 @@ module ImagePack
                       execution,
                       cancellable ? 1 : 0,
                       has_scheduler ? 1 : 0,
-                      strict ? 1 : 0)
+                      strict ? 1 : 0,
+                      strip_icc ? 1 : 0,
+                      trim ? 1 : 0)
     end
 
     def compress(input,
@@ -121,23 +144,37 @@ module ImagePack
                  quality: nil,
                  min_ssim: nil,
                  mozjpeg_trellis: true,
-                 mozjpeg_scan_opt: true,
+                 mozjpeg_scan_opt: nil,
                  progressive: nil,
                  strip_metadata: true,
+                 strip_icc: false,
+                 subsampling: :auto,
+                 tune: :hvs,
+                 effort: :default,
+                 scale: 1,
                  execution: nil,
                  cancellable: false,
                  report: false,
                  strict: false)
+      warn_if_scalar!
       validate_algo!(algo)
       validate_min_ssim!(min_ssim)
       validate_boolean!(:mozjpeg_trellis, mozjpeg_trellis)
+      scan_opt_given = !mozjpeg_scan_opt.nil?
+      mozjpeg_scan_opt = true unless scan_opt_given
       validate_boolean!(:mozjpeg_scan_opt, mozjpeg_scan_opt)
       progressive = default_progressive_for(algo, progressive)
       validate_boolean!(:progressive, progressive)
       validate_boolean!(:strip_metadata, strip_metadata)
+      validate_boolean!(:strip_icc, strip_icc)
       validate_boolean!(:cancellable, cancellable)
       validate_boolean!(:report, report)
       validate_boolean!(:strict, strict)
+      subsampling = validate_subsampling!(subsampling)
+      tune = validate_tune!(tune)
+      effort = validate_effort!(effort)
+      scale_num, scale_denom = validate_scale!(scale)
+      mozjpeg_scan_opt = false if effort == :fast && !scan_opt_given
       quality_was_given = !quality.nil?
       effective_quality = quality_was_given ? quality : DEFAULT_QUALITY
       effective_quality = 1 if min_ssim && !quality_was_given
@@ -163,7 +200,12 @@ module ImagePack
                       has_scheduler ? 1 : 0,
                       report ? 1 : 0,
                       strict ? 1 : 0,
-                      mozjpeg_scan_opt ? 1 : 0)
+                      mozjpeg_scan_opt ? 1 : 0,
+                      strip_icc ? 1 : 0,
+                      SUBSAMPLING_TO_NATIVE.fetch(subsampling),
+                      TUNE_TO_NATIVE.fetch(tune),
+                      EFFORT_TO_NATIVE.fetch(effort),
+                      scale_num, scale_denom)
     end
 
     def compress_pixels(buffer,
@@ -175,18 +217,24 @@ module ImagePack
                         quality: nil,
                         min_ssim: nil,
                         mozjpeg_trellis: true,
-                        mozjpeg_scan_opt: true,
+                        mozjpeg_scan_opt: nil,
                         progressive: nil,
                         drop_alpha: nil,
                         exact_size: false,
+                        subsampling: :auto,
+                        tune: :hvs,
+                        effort: :default,
                         execution: nil,
                         cancellable: false,
                         report: false,
                         strict: false)
+      warn_if_scalar!
       validate_pixel_buffer!(buffer)
       validate_algo!(algo)
       validate_min_ssim!(min_ssim)
       validate_boolean!(:mozjpeg_trellis, mozjpeg_trellis)
+      scan_opt_given = !mozjpeg_scan_opt.nil?
+      mozjpeg_scan_opt = true unless scan_opt_given
       validate_boolean!(:mozjpeg_scan_opt, mozjpeg_scan_opt)
       progressive = default_progressive_for(algo, progressive)
       validate_boolean!(:progressive, progressive)
@@ -195,6 +243,10 @@ module ImagePack
       validate_boolean!(:cancellable, cancellable)
       validate_boolean!(:report, report)
       validate_boolean!(:strict, strict)
+      subsampling = validate_subsampling!(subsampling)
+      tune = validate_tune!(tune)
+      effort = validate_effort!(effort)
+      mozjpeg_scan_opt = false if effort == :fast && !scan_opt_given
       quality_was_given = !quality.nil?
       effective_quality = quality_was_given ? quality : DEFAULT_QUALITY
       effective_quality = 1 if min_ssim && !quality_was_given
@@ -237,10 +289,14 @@ module ImagePack
                         has_scheduler ? 1 : 0,
                         report ? 1 : 0,
                         strict ? 1 : 0,
-                        mozjpeg_scan_opt ? 1 : 0)
+                        mozjpeg_scan_opt ? 1 : 0,
+                        SUBSAMPLING_TO_NATIVE.fetch(subsampling),
+                        TUNE_TO_NATIVE.fetch(tune),
+                        EFFORT_TO_NATIVE.fetch(effort))
     end
 
     def inspect_image(input)
+      warn_if_scalar!
       __inspect_image(input, input_kind!(input))
     end
 
@@ -296,6 +352,64 @@ module ImagePack
       raise InvalidArgumentError, "min_ssim must be Numeric > 0.0 and <= 1.0, got: #{min_ssim.inspect}"
     end
 
+    def validate_subsampling!(value)
+      value = value.to_s.to_sym if value.is_a?(Integer) || value.is_a?(String)
+      return value if SUBSAMPLING_MODES.include?(value)
+
+      raise InvalidArgumentError,
+            "subsampling must be one of #{SUBSAMPLING_MODES}, got: #{value.inspect}"
+    end
+
+    def validate_tune!(value)
+      return value if TUNE_MODES.include?(value)
+
+      raise InvalidArgumentError, "tune must be one of #{TUNE_MODES}, got: #{value.inspect}"
+    end
+
+    def validate_effort!(value)
+      return value if EFFORT_MODES.include?(value)
+
+      raise InvalidArgumentError, "effort must be one of #{EFFORT_MODES}, got: #{value.inspect}"
+    end
+
+    def validate_scale!(value)
+      num, denom =
+        case value
+        when Integer
+          raise InvalidArgumentError, "scale must be a positive fraction, got: #{value.inspect}" unless value.positive?
+
+          [value, 1]
+        when Float
+          if value == 1.0
+            [1, 1]
+          elsif value == 0.5
+            [1, 2]
+          elsif value == 0.25
+            [1, 4]
+          elsif value == 0.125
+            [1, 8]
+          else
+            raise InvalidArgumentError,
+                  "scale float must be 1.0, 0.5, 0.25, or 0.125, got: #{value.inspect}"
+          end
+        when Rational
+          [value.numerator, value.denominator]
+        when Array
+          raise InvalidArgumentError, "scale array must be [num, denom], got: #{value.inspect}" unless value.length == 2
+
+          value
+        else
+          raise InvalidArgumentError,
+                "scale must be 1, 0.5, 0.25, 0.125, Rational, or [num, denom], got: #{value.inspect}"
+        end
+
+      unless num.is_a?(Integer) && denom.is_a?(Integer) && num.positive? && denom.positive?
+        raise InvalidArgumentError, "scale numerator/denominator must be Integers > 0, got: #{value.inspect}"
+      end
+
+      [num, denom]
+    end
+
     def validate_boolean!(name, value)
       return if value == true || value == false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_pack
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Roman Haydarov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-01 00:00:00.000000000 Z
+date: 2026-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,7 +83,6 @@ files:
 - ext/image_pack/vendor/mozjpeg/cdjpeg.h
 - ext/image_pack/vendor/mozjpeg/cmyk.h
 - ext/image_pack/vendor/mozjpeg/coderules.txt
-- ext/image_pack/vendor/mozjpeg/croptest.in
 - ext/image_pack/vendor/mozjpeg/example.txt
 - ext/image_pack/vendor/mozjpeg/jcapimin.c
 - ext/image_pack/vendor/mozjpeg/jcapistd.c
@@ -164,13 +163,10 @@ files:
 - ext/image_pack/vendor/mozjpeg/jstdhuff.c
 - ext/image_pack/vendor/mozjpeg/jutils.c
 - ext/image_pack/vendor/mozjpeg/jversion.h.in
-- ext/image_pack/vendor/mozjpeg/libjpeg.map.in
 - ext/image_pack/vendor/mozjpeg/libjpeg.txt
-- ext/image_pack/vendor/mozjpeg/simd/arm/aarch32/jsimd_neon.S
 - ext/image_pack/vendor/mozjpeg/simd/arm/aarch64/jccolext-neon.c
 - ext/image_pack/vendor/mozjpeg/simd/arm/aarch64/jchuff-neon.c
 - ext/image_pack/vendor/mozjpeg/simd/arm/aarch64/jsimd.c
-- ext/image_pack/vendor/mozjpeg/simd/arm/aarch64/jsimd_neon.S
 - ext/image_pack/vendor/mozjpeg/simd/arm/align.h
 - ext/image_pack/vendor/mozjpeg/simd/arm/jccolor-neon.c
 - ext/image_pack/vendor/mozjpeg/simd/arm/jcgray-neon.c
@@ -189,76 +185,14 @@ files:
 - ext/image_pack/vendor/mozjpeg/simd/arm/jidctint-neon.c
 - ext/image_pack/vendor/mozjpeg/simd/arm/jidctred-neon.c
 - ext/image_pack/vendor/mozjpeg/simd/arm/jquanti-neon.c
+- ext/image_pack/vendor/mozjpeg/simd/arm/neon-compat.h
 - ext/image_pack/vendor/mozjpeg/simd/arm/neon-compat.h.in
-- ext/image_pack/vendor/mozjpeg/simd/i386/jccolext-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jccolext-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jccolext-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jccolor-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jccolor-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jccolor-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcgray-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcgray-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcgray-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcgryext-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcgryext-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcgryext-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jchuff-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcphuff-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcsample-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcsample-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jcsample-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdcolext-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdcolext-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdcolext-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdcolor-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdcolor-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdcolor-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdmerge-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdmerge-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdmerge-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdmrgext-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdmrgext-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdmrgext-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdsample-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdsample-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jdsample-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctflt-3dn.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctflt-sse.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctfst-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctfst-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctint-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctint-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jfdctint-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctflt-3dn.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctflt-sse.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctflt-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctfst-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctfst-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctint-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctint-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctint-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctred-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jidctred-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jquant-3dn.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jquant-mmx.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jquant-sse.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jquantf-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jquanti-avx2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jquanti-sse2.asm
-- ext/image_pack/vendor/mozjpeg/simd/i386/jsimdcpu.asm
 - ext/image_pack/vendor/mozjpeg/simd/jsimd.h
-- ext/image_pack/vendor/mozjpeg/simd/mips/jsimd_dspr2.S
-- ext/image_pack/vendor/mozjpeg/simd/mips/jsimd_dspr2_asm.h
-- ext/image_pack/vendor/mozjpeg/simd/mips64/jcsample.h
-- ext/image_pack/vendor/mozjpeg/simd/mips64/jsimd_mmi.h
-- ext/image_pack/vendor/mozjpeg/simd/mips64/loongson-mmintrin.h
 - ext/image_pack/vendor/mozjpeg/simd/nasm/jcolsamp.inc
 - ext/image_pack/vendor/mozjpeg/simd/nasm/jdct.inc
 - ext/image_pack/vendor/mozjpeg/simd/nasm/jsimdcfg.inc
 - ext/image_pack/vendor/mozjpeg/simd/nasm/jsimdcfg.inc.h
 - ext/image_pack/vendor/mozjpeg/simd/nasm/jsimdext.inc
-- ext/image_pack/vendor/mozjpeg/simd/powerpc/jcsample.h
-- ext/image_pack/vendor/mozjpeg/simd/powerpc/jsimd_altivec.h
 - ext/image_pack/vendor/mozjpeg/simd/x86_64/jccolext-avx2.asm
 - ext/image_pack/vendor/mozjpeg/simd/x86_64/jccolext-sse2.asm
 - ext/image_pack/vendor/mozjpeg/simd/x86_64/jccolor-avx2.asm
@@ -296,11 +230,8 @@ files:
 - ext/image_pack/vendor/mozjpeg/simd/x86_64/jsimd.c
 - ext/image_pack/vendor/mozjpeg/simd/x86_64/jsimdcpu.asm
 - ext/image_pack/vendor/mozjpeg/structure.txt
-- ext/image_pack/vendor/mozjpeg/tjbenchtest.in
-- ext/image_pack/vendor/mozjpeg/tjbenchtest.java.in
-- ext/image_pack/vendor/mozjpeg/tjexampletest.in
-- ext/image_pack/vendor/mozjpeg/tjexampletest.java.in
 - ext/image_pack/vendor/mozjpeg/tjutil.h
+- ext/image_pack/vendor/mozjpeg/transupp.c
 - ext/image_pack/vendor/mozjpeg/transupp.h
 - ext/image_pack/vendor/mozjpeg/turbojpeg.h
 - ext/image_pack/vendor/mozjpeg/usage.txt

data/ext/image_pack/vendor/mozjpeg/croptest.in

@@ -1,95 +0,0 @@
-#!/bin/bash
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-onexit()
-{
-	if [ -d $OUTDIR ]; then
-		rm -rf $OUTDIR
-	fi
-}
-
-runme()
-{
-	echo \*\*\* $*
-	$*
-}
-
-IMAGE=vgl_6548_0026a.bmp
-WIDTH=128
-HEIGHT=95
-IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages
-OUTDIR=`mktemp -d /tmp/__croptest_output.XXXXXX`
-EXEDIR=@CMAKE_CURRENT_BINARY_DIR@
-
-if [ -d $OUTDIR ]; then
-	rm -rf $OUTDIR
-fi
-mkdir -p $OUTDIR
-
-exec >$EXEDIR/croptest.log
-
-echo "============================================================"
-echo "$IMAGE ($WIDTH x $HEIGHT)"
-echo "============================================================"
-echo
-
-for PROGARG in "" -progressive; do
-
-	cp $IMGDIR/$IMAGE $OUTDIR
-	basename=`basename $IMAGE .bmp`
-	echo "------------------------------------------------------------"
-	echo "Generating test images"
-	echo "------------------------------------------------------------"
-	echo
-	runme $EXEDIR/cjpeg $PROGARG -grayscale -outfile $OUTDIR/${basename}_GRAY.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg $PROGARG -sample 2x2 -outfile $OUTDIR/${basename}_420.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg $PROGARG -sample 2x1 -outfile $OUTDIR/${basename}_422.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg $PROGARG -sample 1x2 -outfile $OUTDIR/${basename}_440.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg $PROGARG -sample 1x1 -outfile $OUTDIR/${basename}_444.jpg $IMGDIR/${basename}.bmp
-	echo
-
-	for NSARG in "" -nosmooth; do
-
-		for COLORSARG in "" "-colors 256 -dither none -onepass"; do
-
-			for Y in {0..16}; do
-
-				for H in {1..16}; do
-
-					X=$(( (Y*16)%128 ))
-					W=$(( WIDTH-X-7 ))
-					if [ $Y -le 15 ]; then
-						CROPSPEC="${W}x${H}+${X}+${Y}"
-					else
-						Y2=$(( HEIGHT-H ));
-						CROPSPEC="${W}x${H}+${X}+${Y2}"
-					fi
-
-					echo "------------------------------------------------------------"
-					echo $PROGARG $NSARG $COLORSARG -crop $CROPSPEC
-					echo "------------------------------------------------------------"
-					echo
-					for samp in GRAY 420 422 440 444; do
-						$EXEDIR/djpeg $NSARG $COLORSARG -rgb -outfile $OUTDIR/${basename}_${samp}_full.ppm $OUTDIR/${basename}_${samp}.jpg
-						convert -crop $CROPSPEC $OUTDIR/${basename}_${samp}_full.ppm $OUTDIR/${basename}_${samp}_ref.ppm
-						runme $EXEDIR/djpeg $NSARG $COLORSARG -crop $CROPSPEC -rgb -outfile $OUTDIR/${basename}_${samp}.ppm $OUTDIR/${basename}_${samp}.jpg
-						runme cmp $OUTDIR/${basename}_${samp}.ppm $OUTDIR/${basename}_${samp}_ref.ppm
-					done
-					echo
-
-				done
-
-			done
-
-		done
-
-	done
-
-done
-
-echo SUCCESS!

data/ext/image_pack/vendor/mozjpeg/libjpeg.map.in

@@ -1,11 +0,0 @@
-LIBJPEGTURBO_@JPEG_LIB_VERSION_DECIMAL@ {
-  @MEM_SRCDST_FUNCTIONS@
-  local:
-    jsimd_*;
-    jconst_*;
-};
-
-LIBJPEG_@JPEG_LIB_VERSION_DECIMAL@ {
-  global:
-    *;
-};