fixup encoding

stemann · Apr 10, 2024 · b717f27 · b717f27
1 parent 030180f
commit b717f27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/encoding.jl b/src/encoding.jl
@@ -1,6 +1,7 @@
 function encode(
-    image::Matrix{TColor}; lossy = false, quality = 70, transpose = false
+    image::Matrix{TColor}; quality::Union{Int, Nothing} = nothing, transpose = false
 )::Vector{UInt8} where {TColor <: Colorant}
+    lossy = !isnothing(quality)
     if TColor == RGB{N0f8}
         webp_encode_fn = lossy ? Wrapper.WebPEncodeRGB : Wrapper.WebPEncodeLosslessRGB
     elseif TColor == BGR{N0f8}
@@ -13,7 +14,6 @@ function encode(
         throw(ArgumentError("Unsupported color type: $TColor"))
     end
 
-    quality_factor = quality / 100.0f0
     if !transpose # TODO the kwarg transpose is quite confusing/misleading
         image = permutedims(image, (2, 1))
     end
@@ -22,6 +22,7 @@ function encode(
     stride = width * sizeof(TColor)
     output_ptr = Ref{Ptr{UInt8}}()
     if lossy
+        quality_factor = quality / 100.0f0
         output_length = webp_encode_fn(
             pointer(image), width, height, stride, quality_factor, output_ptr
         )

diff --git a/test/encoding_tests.jl b/test/encoding_tests.jl
@@ -28,7 +28,7 @@ using WebP
             @testset "Lossy" begin
                 qualities = [1, 10, 50, 100]
                 for quality in qualities
-                    input_kwargs = merge(kwargs, (lossy = true, quality = quality))
+                    input_kwargs = merge(kwargs, (quality = quality,))
                     @testset "WebP.encode(::Matrix{$TColor}; $input_kwargs)" begin
                         data = WebP.encode(input_image; input_kwargs...)
                         output = WebP.decode(data)