fast_thumbhash 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dd0e9e710dfa53775b6c718fd674fdc26fb0a17932058ca18e495b229d43e30
-  data.tar.gz: dc6e6c4203596d64bb3fb7e84fa63b72dda92cd5b7612a97371cb4ae418ae2af
+  metadata.gz: 7ca1251a50f86a6d61d03d4aca11a98b30336a72c12f5d5e8a15992c8d694638
+  data.tar.gz: e77931c369a56aec1f619b4da9ef822623d5e0f4e839aab43e88ebc80ad5b748
 SHA512:
-  metadata.gz: 29c037a813de79ec9a791484823fc42291e2bbc6dd5c8c6a8ecc4d5e17b9de52dfcc64cd554372604bd8068cc5239e898b982f875e0f1efd62cac53967dabf05
-  data.tar.gz: 2d0f21baac23f3c28e024d6755a45cdae2c9f4b1dd78243ccd98e6fa6e9b01520f1ff28f9c113d4ab0a9c2ecc0988a0fa801c141310d760337c8f1ec37cc002b
+  metadata.gz: 66332f36f6e8d43256725abeb3c6a0e1f59a0cf8601516a3d5d8f6c0820259e7a7c2fa00afa5ece7b7eb834d78fd156407726d135d61e31d16b06a1e33547d52
+  data.tar.gz: cb3673f55f78c9a64b00d5ebe442ff44fa966df878f2bcc1f511a0d7a4ca672412510d55c891afeddf53e65c864f678ea87ffcdbd679f1bcc385d63acc8e78e0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fast_thumbhash (0.6.0)
+    fast_thumbhash (0.7.0)
       ffi
 
 GEM

data/lib/fast_thumbhash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastThumbhash
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/fast_thumbhash.rb

@@ -33,29 +33,66 @@ module FastThumbhash
     homogeneous_transform: nil,
     saturation: 0
   )
+    %i[solid blur clamp].include?(fill_mode) or
+      raise ArgumentError, "Invalid `fill_mode` option"
+
+    if fill_color
+      fill_color.length == 4 or
+        raise ArgumentError, "You need to pass [r, g, b, a] to the `fill_color` option"
+    end
+
+    raise ArgumentError, "Option `fill_color` is required for :solid fill_mode" if fill_mode == :solid && fill_color.nil?
+
+    if homogeneous_transform
+      (homogeneous_transform.size == 3 && homogeneous_transform.all? { |row| row.size == 3 }) or
+        raise ArgumentError, "`homogeneous_transform` option must be a 3x3 matrix"
+    end
+
+    if size
+      size.length == 2 or
+        raise ArgumentError, "You need to pass [width, height] to the `size` option"
+
+      size.all? { |dimension| dimension < 100 } or
+        raise ArgumentError, "Cannot generate images bigger then 100 pixels"
+    end
+
+    if max_size
+      max_size <= 100 or
+        raise ArgumentError, "Cannot generate images bigger then 100 pixels"
+    end
+
     !max_size.nil? ^ !size.nil? or
       raise ArgumentError, "Pass either the `max_size` option, or an explicit `size`"
 
-    %i[solid blur clamp].include?(fill_mode) or
-      raise ArgumentError, "Invalid `fill_mode` option"
+    binary_thumbhash_to_rgba!(
+      binary_thumbhash,
+      max_size: max_size,
+      size: size,
+      fill_mode: fill_mode,
+      fill_color: fill_color,
+      homogeneous_transform: homogeneous_transform,
+      saturation: saturation
+    )
+  end
 
+  def self.binary_thumbhash_to_rgba!(
+    binary_thumbhash,
+    max_size: nil,
+    size: nil,
+    fill_mode: :solid,
+    fill_color: [255, 255, 255, 0],
+    homogeneous_transform: nil,
+    saturation: 0
+  )
     fill_color_pointer =
       if fill_color
-        fill_color.length == 4 or
-          raise ArgumentError, "You need to pass [r, g, b, a] to the `fill_color` option"
-
         FFI::MemoryPointer.new(:uint8, 4).tap do |p|
           p.write_array_of_uint8(fill_color)
         end
       end
 
-    raise ArgumentError, "Option `fill_color` is required for :solid fill_mode" if fill_mode == :solid && fill_color.nil?
-
     transform_pointer =
       if homogeneous_transform
-        (homogeneous_transform.size == 3 && homogeneous_transform.all? { |row| row.size == 3 }) or
-          raise ArgumentError, "`homogeneous_transform` option must be a 3x3 matrix"
-
         FFI::MemoryPointer.new(:double, 6).tap do |p|
           p.write_array_of_double(
             [
@@ -75,17 +112,8 @@ module FastThumbhash
 
     width, height =
       if size
-        size.length == 2 or
-          raise ArgumentError, "You need to pass [width, height] to the `size` option"
-
-        size.all? { |dimension| dimension < 100 } or
-          raise ArgumentError, "Cannot generate images bigger then 100 pixels"
-
         size
       else
-        max_size <= 100 or
-          raise ArgumentError, "Cannot generate images bigger then 100 pixels"
-
         thumb_size_pointer = FFI::MemoryPointer.new(:uint8, 2)
         Library.thumb_size(thumbhash_pointer, max_size, thumb_size_pointer)
         thumb_size_pointer.read_array_of_uint8(2)
@@ -93,6 +121,7 @@ module FastThumbhash
 
     rgba_size = width * height * 4
     rgba_pointer = FFI::MemoryPointer.new(:uint8, rgba_size)
+
     Library.thumbhash_to_rgba(
       thumbhash_pointer,
       width,
@@ -100,7 +129,7 @@ module FastThumbhash
       fill_mode.to_sym,
       fill_color_pointer,
       transform_pointer,
-      saturation,
+      saturation.clamp(-100, 100),
       rgba_pointer
     )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_thumbhash
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Stefano Verna
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi