fast_thumbhash 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ceda168edb83030206e690750cd035f7de93474447f15b7690934a9471da3a
-  data.tar.gz: c88f2732b5a0614e92b28980dab11a48dbc8ecf813857bf572a6f3d667695151
+  metadata.gz: 60904812112ec4cbab475e36e04f7634c96cb36946d5c3e178ccbfe1ca985727
+  data.tar.gz: d195d956dcbc219971be4d25fbb486fb5d61515a1a9ea33c03ec184bb97c4a5a
 SHA512:
-  metadata.gz: dc0bfb9cdf1206f0949ad46589bd8cecfe5c59bac958c1d812239cae38618d5cfe3ea6a61386ab9028386ff452472a37c3cc45082b6d462aebb8b7f542077126
-  data.tar.gz: b2449a53c70003ea2ddef3701620e8021140f33d15c1fa9ca96225b553989ed9e661e093adbba66f89377a6294f19fe9b34199409e207cf6bc7cf1d4cc3a72ff
+  metadata.gz: ae83b2dd113977b72d4b89207c41119038b062b73d4d07e67864391764f6a6d3ef2791ac323c8ef2851a83c57c3cf9cefaca1c8feca6f717bcfe30ce177dcdb3
+  data.tar.gz: 3ffb0c9274880eb74092c866b1a618ca315a94348c4725f1e64ebba474982708e9d99f6d30e88d76352a8d6f3cad45ccabc92747e2e3d743c94baa6eeee83b14

data/Gemfile.lock

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

data/README.md

@@ -92,7 +92,7 @@ w, h, rgba = described_class.thumbhash_to_rgba(
 
 ##### `fill_mode`
 
-The `fill_mode` option specifies how to fill in any transparent areas in your image with a color of your choice. When `fill_mode` is `:solid`, you need to pass an additional `fill_color` option to specify the actual RGBA color to use. When `fill_mode` is `:blur`, the excess space will be filled with a blurred version of the original image itself.
+The `fill_mode` option specifies how to fill in any transparent areas in your image with a color of your choice. When `fill_mode` is `:solid`, you need to pass an additional `fill_color` option to specify the actual RGBA color to use. When `fill_mode` is `:blur`, the excess space will be filled with a blurred version of the original image itself. When `fill_image` is `:clamp`, the excess space is filled with extended pixels from the edge of the image.
 
 ```ruby
 w, h, rgba = described_class.thumbhash_to_rgba(

data/ext/fast_thumbhash/fast_thumbhash.c

@@ -379,7 +379,7 @@ void thumbhash_to_rgba(
 
       double r, g, b, a;
 
-      if (fill_mode == BLUR) {
+      if (fill_mode == CLAMP) {
         if (x < 0)
         {
           x = 0;
@@ -398,7 +398,9 @@ void thumbhash_to_rgba(
         }
       }
 
-      if (x >= 0 && x <= 1.0 && y >= 0 && y <= 1.0) {
+      bool inside_image = x >= 0 && x <= 1.0 && y >= 0 && y <= 1.0;
+
+      if (inside_image) {
         double l = l_dc, p = p_dc, q = q_dc;
         a = a_dc;
 
@@ -453,9 +455,9 @@ void thumbhash_to_rgba(
         r = (3.0 * l - b + q) / 2.0;
         g = r - q;
       } else {
-        r = 0;
-        g = 0;
-        b = 0;
+        r = 255;
+        g = 255;
+        b = 255;
         a = 0;
       }
 
@@ -466,14 +468,17 @@ void thumbhash_to_rgba(
         fmax(0, 255 * fmin(1, a))
       };
 
-      if (fill_mode == SOLID) {
-        // Alpha-blending
-        double top_alpha = (double) top[3] / 255.0;
-
-        rgba[i]   = roundf(top[0] * top_alpha + fill_color[0] * (1.0 - top_alpha));
-        rgba[i+1] = roundf(top[1] * top_alpha + fill_color[1] * (1.0 - top_alpha));
-        rgba[i+2] = roundf(top[2] * top_alpha + fill_color[2] * (1.0 - top_alpha));
-        rgba[i+3] = roundf(top[3] * top_alpha + fill_color[3] * (1.0 - top_alpha));
+      if (fill_color && fill_color[3] > 0) {
+        double top_a = (double) top[3] / 255.0;
+        double fill_color_a = (double) fill_color[3] / 255.0;
+        double inverse_top_a = 1.0 - top_a;
+        double sum_a = top_a + fill_color_a * inverse_top_a;
+
+        // Alpha compositing (top over fill_color)
+        rgba[i]   = roundf(((double) top[0] * top_a + (double) fill_color[0] * fill_color_a * inverse_top_a) / sum_a);
+        rgba[i+1] = roundf(((double) top[1] * top_a + (double) fill_color[1] * fill_color_a * inverse_top_a) / sum_a);
+        rgba[i+2] = roundf(((double) top[2] * top_a + (double) fill_color[2] * fill_color_a * inverse_top_a) / sum_a);
+        rgba[i+3] = roundf(sum_a * 255.0);
       } else {
         rgba[i]   = top[0];
         rgba[i+1] = top[1];

data/ext/fast_thumbhash/fast_thumbhash.h

@@ -4,9 +4,9 @@
 #include <stdint.h>
 
 enum FillMode {
-  NO_FILL = 0,
   SOLID = 1,
   BLUR = 2,
+  CLAMP = 3,
 };
 
 void rgba_to_thumbhash(

data/lib/fast_thumbhash/version.rb

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

data/lib/fast_thumbhash.rb

@@ -8,8 +8,8 @@ module FastThumbhash
     thumbhash,
     max_size: nil,
     size: nil,
-    fill_mode: :no_fill,
-    fill_color: nil,
+    fill_mode: :solid,
+    fill_color: [255, 255, 255, 0],
     homogeneous_transform: nil,
     saturation: 0
   )
@@ -28,22 +28,19 @@ module FastThumbhash
     binary_thumbhash,
     max_size: nil,
     size: nil,
-    fill_mode: :no_fill,
-    fill_color: nil,
+    fill_mode: :solid,
+    fill_color: [255, 255, 255, 0],
     homogeneous_transform: nil,
     saturation: 0
   )
     !max_size.nil? ^ !size.nil? or
       raise ArgumentError, "Pass either the `max_size` option, or an explicit `size`"
 
-    %i[solid blur no_fill].include?(fill_mode) or
+    %i[solid blur clamp].include?(fill_mode) or
       raise ArgumentError, "Invalid `fill_mode` option"
 
     fill_color_pointer =
-      if fill_mode == :solid
-        fill_color or
-          raise ArgumentError, "`fill_color` is required if fill_mode = :solid"
-
+      if fill_color
         fill_color.length == 4 or
           raise ArgumentError, "You need to pass [r, g, b, a] to the `fill_color` option"
 
@@ -52,6 +49,8 @@ module FastThumbhash
         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
@@ -143,9 +142,9 @@ module FastThumbhash
     ffi_lib File.join(File.expand_path(__dir__), "fast_thumbhash.#{RbConfig::CONFIG["DLEXT"]}")
 
     enum :fill_mode, [
-      :no_fill, 0,
-      :solid,
-      :blur
+      :solid, 0,
+      :blur,
+      :clamp
     ]
 
     attach_function :thumb_size, %i[pointer uint8 pointer], :size_t

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fast_thumbhash
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Stefano Verna