eyes_core 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38515d04836152a9f34789c311d48d02d9d6521d
-  data.tar.gz: 4e28df8c66469f4cdef6654b3ae564eaa3ecbf13
+  metadata.gz: 734dda49eb71281c85770bc8e075346b303417f8
+  data.tar.gz: '08dfc01e914c3c9d42958d018dba34a8a3305060'
 SHA512:
-  metadata.gz: 0daa88afc091c11823b9d217497e9a2b786749cc47fb30be654ee0a76de70a5624418cef6e2b62c6ddd80b36c3d395154328829200b8b7be5a2b9f1f7092758f
-  data.tar.gz: 8694cf67a6d57a16d68571c42c767c372758cf4145875629609238f2ac9cf6b06a97ca30f3280ede2f19ec5e8362b802433d55ba1a06dbf77ccbfb372282eacb
+  metadata.gz: 3365239f1bf1f1843936585a9c25bc7c2804d5ee72ff3928e32e242d0cff34447af492545298a1c13f0e819668016eb4ea5730cec7b6dd1a5f46575e8c6c9195
+  data.tar.gz: 5292266eaf979ff3caad6b05cb937fa64e9eb25f0e67378625f26ca4450da4460563615c5601564468ddfff0c5767f98602b6dd827293bc418448e0bfa8de1e5

data/ext/eyes_core/eyes_core.c

@@ -5,12 +5,13 @@ void Init_eyes_core() {
   VALUE Resampling = rb_define_module_under(Applitools, "ResamplingFast");
   rb_define_method(Resampling, "interpolate_cubic", c_interpolate_cubic, 1);
   rb_define_method(Resampling, "merge_pixels", c_merge_pixels, 1);
+  rb_define_method(Resampling, "bicubic_points2", c_bicubic_points, 3);
+  rb_define_method(Resampling, "scale_points2", scale_points2, 4);
 };
 
 
 VALUE c_interpolate_cubic(VALUE self, VALUE data) {
   double t = NUM2DBL(rb_ary_entry(data, 1));
-  BYTE  new_r, new_g, new_b, new_a;
   VALUE p0, p1, p2, p3;
 
   p0 = NUM2UINT(rb_ary_entry(data, 2));
@@ -18,13 +19,19 @@ VALUE c_interpolate_cubic(VALUE self, VALUE data) {
   p2 = NUM2UINT(rb_ary_entry(data, 4));
   p3 = NUM2UINT(rb_ary_entry(data, 5));
 
+  return raw_interpolate_cubic(self, t, p0, p1, p2, p3);
+};
+
+VALUE raw_interpolate_cubic(VALUE self, double t, VALUE p0, VALUE p1, VALUE p2, VALUE p3) {
+  BYTE  new_r, new_g, new_b, new_a;
+
   new_r = interpolate_char(t, R_BYTE(p0), R_BYTE(p1), R_BYTE(p2), R_BYTE(p3));
   new_g = interpolate_char(t, G_BYTE(p0), G_BYTE(p1), G_BYTE(p2), G_BYTE(p3));
   new_b = interpolate_char(t, B_BYTE(p0), B_BYTE(p1), B_BYTE(p2), B_BYTE(p3));
   new_a = interpolate_char(t, A_BYTE(p0), A_BYTE(p1), A_BYTE(p2), A_BYTE(p3));
 
   return UINT2NUM(BUILD_PIXEL(new_r, new_g, new_b, new_a));
-};
+}
 
 BYTE interpolate_char(double t, BYTE c0, BYTE c1, BYTE c2, BYTE c3) {
   double a, b, c, d, res;
@@ -78,3 +85,122 @@ VALUE c_merge_pixels(VALUE self, VALUE pixels) {
   new_a = (BYTE)(acum_a/(size - 1) + 0.5);
   return UINT2NUM(BUILD_PIXEL(new_r, new_g, new_b, new_a));
 }
+
+VALUE raw_merge_pixels(VALUE merge_pixels[], unsigned int size) {
+  unsigned int i, real_colors, acum_r, acum_g, acum_b, acum_a;
+  BYTE new_r, new_g, new_b, new_a;
+  PIXEL pix;
+
+  acum_r = 0;
+  acum_g = 0;
+  acum_b = 0;
+  acum_a = 0;
+
+  new_r = 0;
+  new_g = 0;
+  new_b = 0;
+  new_a = 0;
+
+  real_colors = 0;
+
+  for(i=0; i < size; i++) {
+    pix = NUM2UINT(merge_pixels[i]);
+    if(A_BYTE(pix) != 0) {
+      acum_r += R_BYTE(pix);
+      acum_g += G_BYTE(pix);
+      acum_b += B_BYTE(pix);
+      acum_a += A_BYTE(pix);
+      real_colors += 1;
+    }
+  }
+
+  if(real_colors > 0) {
+    new_r = (BYTE)(acum_r/real_colors + 0.5);
+    new_g = (BYTE)(acum_g/real_colors + 0.5);
+    new_b = (BYTE)(acum_b/real_colors + 0.5);
+  }
+  new_a = (BYTE)(acum_a/(size - 1) + 0.5);
+  return UINT2NUM(BUILD_PIXEL(new_r, new_g, new_b, new_a));
+}
+
+VALUE c_bicubic_points(VALUE self, VALUE src_dimension, VALUE dst_dimension, VALUE direction) {
+  unsigned long y_bounds, pixels_size, c_src_dimension, c_dst_dimension, index, index_y;
+  double step;
+  VALUE result_array;
+
+  unsigned long steps [NUM2UINT(dst_dimension)];
+  double residues [NUM2UINT(dst_dimension)];
+  VALUE line_bounds;
+
+  c_src_dimension = NUM2UINT(src_dimension);
+  c_dst_dimension = NUM2UINT(dst_dimension);
+  
+  step = (double)(c_src_dimension - 1) / c_dst_dimension;
+
+  if (RTEST(direction)) {
+    y_bounds = NUM2UINT(rb_funcall(self, rb_intern("width"), 0, NULL));
+  } else {
+    y_bounds = NUM2UINT(rb_funcall(self, rb_intern("height"), 0, NULL));
+  };
+
+  pixels_size = y_bounds * c_dst_dimension;
+  result_array = rb_ary_new2(pixels_size);
+
+  for (unsigned long i=0; i < c_dst_dimension; i++) {
+    steps[i] = (unsigned long)i*step;
+    residues[i] = i*step - steps[i];
+  };
+
+  for (unsigned long y=0; y < y_bounds; y++) {
+    line_bounds = rb_funcall(self, rb_intern("line_with_bounds"), 3, UINT2NUM(y), src_dimension, direction);
+
+    index_y = c_dst_dimension * y;
+    for (unsigned long x=0; x < c_dst_dimension; x++) {
+      if (RTEST(direction)) {
+        index = y_bounds * x + y;
+      } else {
+        index = index_y + x;
+      }
+      rb_ary_store(result_array, index, raw_interpolate_cubic(self, residues[x],
+        NUM2UINT(rb_ary_entry(line_bounds, steps[x])),
+        NUM2UINT(rb_ary_entry(line_bounds, steps[x] + 1)),
+        NUM2UINT(rb_ary_entry(line_bounds, steps[x] + 2)),
+        NUM2UINT(rb_ary_entry(line_bounds, steps[x] + 3)))
+      );
+    }
+  }
+
+  return result_array;
+}
+
+VALUE scale_points2(VALUE self, VALUE dst_width, VALUE dst_height, VALUE w_m, VALUE h_m) {
+  unsigned long c_dst_height, c_dst_width, y_pos, x_pos, index;
+  unsigned int c_w_m, c_h_m, buffer_index, buffer_size;
+  VALUE pixels_to_merge [NUM2UINT(w_m) * NUM2UINT(h_m)];
+  VALUE result;
+
+  c_dst_height = NUM2UINT(dst_height);
+  c_dst_width = NUM2UINT(dst_width);
+
+  c_w_m = NUM2UINT(w_m);
+  c_h_m = NUM2UINT(h_m);
+
+  result = rb_ary_new2(c_dst_width * c_dst_height);
+  buffer_size = c_h_m * c_w_m;
+
+  for (unsigned long i = 0; i < c_dst_height; i++) {
+    for (unsigned long j = 0; j < c_dst_width; j++) {
+      buffer_index = 0;
+      for (unsigned int y = 0; y < c_h_m; y++) {
+        y_pos = i * c_h_m + y;
+        for (unsigned int x = 0; x < c_w_m; x++) {
+          x_pos = j * c_w_m + x;
+          pixels_to_merge[buffer_index++] = rb_funcall(self, rb_intern("get_pixel"), 2, UINT2NUM(x_pos), UINT2NUM(y_pos));
+        }
+      }
+      index = i * c_dst_width + j;
+      rb_ary_store(result, index, raw_merge_pixels(pixels_to_merge, buffer_size));
+    }
+  }
+  return result;
+}

data/ext/eyes_core/eyes_core.h

@@ -18,7 +18,11 @@ typedef unsigned char BYTE; // Bytes use 8 bits unsigned integers
 void Init_resampling();
 
 VALUE c_interpolate_cubic(VALUE,VALUE);
+VALUE raw_interpolate_cubic(VALUE, double, VALUE, VALUE, VALUE, VALUE);
+VALUE scale_points2(VALUE, VALUE, VALUE, VALUE, VALUE);
 VALUE c_merge_pixels(VALUE, VALUE);
+VALUE raw_merge_pixels(VALUE[], unsigned int);
+VALUE c_bicubic_points(VALUE, VALUE, VALUE, VALUE);
 BYTE interpolate_char(double, BYTE, BYTE, BYTE, BYTE);
 
 #endif

data/lib/applitools/chunky_png/resampling.rb

@@ -7,31 +7,15 @@ module Applitools::ChunkyPNG
       dst_width2 = dst_width * w_m
       dst_height2 = dst_height * h_m
 
-      points = bicubic_x_points(dst_width2)
-      pixels = Array.new(points.size)
-
-      points.each do |interpolation_data|
-        pixels[interpolation_data[0]] = interpolate_cubic(interpolation_data)
-      end
+      pixels = bicubic_x_points(dst_width2)
       replace_canvas!(dst_width2, height, pixels)
 
-      points = bicubic_y_points(dst_height2)
-      pixels = Array.new(points.size)
-
-      points.each do |interpolation_data|
-        pixels[interpolation_data[0]] = interpolate_cubic(interpolation_data)
-      end
+      pixels = bicubic_y_points(dst_height2)
       replace_canvas!(dst_width2, dst_height2, pixels)
 
       return self unless w_m * h_m > 1
 
-      points = scale_points(dst_width, dst_height, w_m, h_m)
-      pixels = Array.new(points.size)
-
-      points.each do |merge_data|
-        pixels[merge_data[0]] = merge_pixels(merge_data)
-      end
-
+      pixels = scale_points2(dst_width, dst_height, w_m, h_m);
       replace_canvas!(dst_width, dst_height, pixels)
     end
 
@@ -40,101 +24,19 @@ module Applitools::ChunkyPNG
     end
 
     def bicubic_x_points(dst_width)
-      bicubic_points(width, dst_width, false)
+      bicubic_points2(width, dst_width, false)
     end
 
     def bicubic_y_points(dst_height)
-      bicubic_points(height, dst_height, true)
-    end
-
-    def bicubic_points(src_dimension, dst_dimension, direction, y_start_position = 0)
-      step = (src_dimension - 1).to_f / dst_dimension
-      y_bounds = direction ? width : height
-      raise ArgumentError.new 'Start position value is invalid!' unless y_start_position < y_bounds
-      pixels_size = (y_bounds - y_start_position) * dst_dimension
-
-      steps = Array.new(dst_dimension)
-      residues = Array.new(dst_dimension)
-
-      (0..dst_dimension - 1).each do |i|
-        steps[i] = (i * step).to_i
-        residues[i] = i * step - steps[i]
-      end
-      Enumerator.new(pixels_size) do |enum|
-        (y_start_position..y_bounds - 1).each do |y|
-          line = (direction ? column(y) : row(y))
-
-          line_with_bounds = [imaginable_point(line[0], line[1])] + line + [
-            imaginable_point(line[src_dimension - 2], line[src_dimension - 3]),
-            imaginable_point(line[src_dimension - 1], line[src_dimension - 2])
-          ]
-
-          index_y = dst_dimension * y
-          (0..dst_dimension - 1).each do |x|
-            index = direction ? y_bounds * x + y : index_y + x
-            enum << ([index, residues[x]] + line_with_bounds.last(src_dimension + 3 - steps[x]).first(4))
-          end
-        end
-      end
+      bicubic_points2(height, dst_height, true)
     end
 
-    def scale_points(dst_width, dst_height, w_m, h_m)
-      Enumerator.new(dst_width * dst_height) do |enum|
-        (0..dst_height - 1).each do |i|
-          (0..dst_width - 1).each do |j|
-            pixels_to_merge = []
-            (0..h_m - 1).each do |y|
-              y_pos = i * h_m + y
-              (0..w_m - 1).each do |x|
-                x_pos = j * w_m + x
-                pixels_to_merge << get_pixel(x_pos, y_pos)
-              end
-            end
-            index = i * dst_width + j
-            enum << ([index] + pixels_to_merge)
-          end
-        end
-      end
-    end
-
-    def merge_pixels(merge_data)
-      pixels = merge_data[1..merge_data.size]
-      merged_data = pixels.each_with_object(r: 0, g: 0, b: 0, a: 0, real_colors: 0) do |pixel, result|
-        unless ChunkyPNG::Color.fully_transparent?(pixel)
-          result[:real_colors] += 1
-          [:r, :g, :b].each do |ch|
-            result[ch] += ChunkyPNG::Color.send(ch, pixel)
-          end
-        end
-        result[:a] += ChunkyPNG::Color.a(pixel)
-        result
-      end
-
-      r = merged_data[:real_colors] > 0 ? merged_data[:r] / merged_data[:real_colors] : 0
-      g = merged_data[:real_colors] > 0 ? merged_data[:g] / merged_data[:real_colors] : 0
-      b = merged_data[:real_colors] > 0 ? merged_data[:b] / merged_data[:real_colors] : 0
-      a = merged_data[:a] / pixels.size
-
-      ChunkyPNG::Color.rgba(r, g, b, a)
-    end
-
-    def interpolate_cubic(data)
-      result = {}
-      t = data[1]
-      [:r, :g, :b, :a].each do |chan|
-        c0 = ChunkyPNG::Color.send(chan, data[2])
-        c1 = ChunkyPNG::Color.send(chan, data[3])
-        c2 = ChunkyPNG::Color.send(chan, data[4])
-        c3 = ChunkyPNG::Color.send(chan, data[5])
-
-        a = -0.5 * c0 + 1.5 * c1 - 1.5 * c2 + 0.5 * c3
-        b = c0 - 2.5 * c1 + 2 * c2 - 0.5 * c3
-        c = 0.5 * c2 - 0.5 * c0
-        d = c1
-
-        result[chan] = [0, [255, (a * t**3 + b * t**2 + c * t + d).to_i].min].max
-      end
-      ChunkyPNG::Color.rgba(result[:r], result[:g], result[:b], result[:a])
+    def line_with_bounds(y, src_dimension, direction)
+      line = (direction ? column(y) : row(y))
+      [imaginable_point(line[0], line[1])] + line + [
+          imaginable_point(line[src_dimension - 2], line[src_dimension - 3]),
+          imaginable_point(line[src_dimension - 1], line[src_dimension - 2])
+      ]
     end
 
     def imaginable_point(point1, point2)

data/lib/applitools/core/screenshot.rb

@@ -13,6 +13,13 @@ module Applitools
       @datastream = ::ChunkyPNG::Datastream.from_string image
     end
 
+    def update!(image)
+      Applitools::ArgumentGuard.not_nil(image, 'image')
+      Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
+      @datastream = image.to_datastream
+      self
+    end
+
     def to_blob
       @datastream.to_blob
     end
@@ -21,6 +28,8 @@ module Applitools
       restore
     end
 
+    alias image __getobj__
+
     def header
       @datastream.header_chunk
     end

data/lib/applitools/utils/image_utils.rb

@@ -84,7 +84,9 @@ module Applitools::Utils
       image_ratio = image.width.to_f / image.height.to_f
       scale_width = (image.width * scale_ratio).ceil
       scale_height = (scale_width / image_ratio).ceil
-      resize_image!(image, scale_width, scale_height)
+      buffered_image = image.image
+      resize_image!(buffered_image, scale_width, scale_height)
+      image.update!(buffered_image)
     end
 
     def scale(image, scale_ratio)
@@ -95,7 +97,7 @@ module Applitools::Utils
       Applitools::ArgumentGuard.not_nil(new_width, 'new_width')
       Applitools::ArgumentGuard.not_nil(new_height, 'new_height')
       Applitools::ArgumentGuard.not_nil(image, 'image')
-      Applitools::ArgumentGuard.is_a?(image, 'image', Applitools::Screenshot)
+      Applitools::ArgumentGuard.is_a?(image, 'image', ::ChunkyPNG::Image)
 
       raise Applitools::EyesIllegalArgument.new "Invalid width: #{new_width}" if new_width <= 0
       raise Applitools::EyesIllegalArgument.new "Invalid height: #{new_height}" if new_height <= 0

data/lib/applitools/version.rb

@@ -1,3 +1,3 @@
 module Applitools
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eyes_core
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Applitools Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png