psd_native 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c97817e8dc5cc4bc5c152271dec5220be1c72733
-  data.tar.gz: 33ce557f4e155bcabd6e8b6bc33207799e7094a7
+  metadata.gz: ba6252238c0a42264e81b13c9ad094d459f937cc
+  data.tar.gz: a9d7254957111c606e550f1e05217070075c1bc2
 SHA512:
-  metadata.gz: 8616aa6ff2eba454d41b0ea8311f7e815ddbda88bf9689f06a0ecf95a1d10c6f6acc7435bb2ba505c041108e33845aa5f978c350c4169e920856795f960ff1bb
-  data.tar.gz: 8f0ea25002ae6127a6ddc295e0cca45117061d89b82c226d6ed1952563a5a96baedaf97b2d4ca1c2fa3351bc8e251fda7480b5a25597ed6630f96f5633f89f94
+  metadata.gz: 51b58c58785979aff5206139ba2ba1bdfdb987e464bed797f64922c058c5fd9d286b9b205343f8eee705345b5f2e2a7338ce80bd23f499418cd88d1e7fecc0c4
+  data.tar.gz: e0fb65e4287bb98cd45362549cebb806e0a3450979756fe20d3b34801f27110812a2093c863fff411ad5f18092a34b11e1570023c88950c2addbc8c998037b6f

data/ext/psd_native/mask.c

@@ -0,0 +1,48 @@
+#include "psd_native_ext.h"
+
+VALUE psd_native_mask_apply_bang(VALUE self) {
+  psd_logger("debug", "Applying mask with native code");
+
+  int doc_width = FIX2INT(rb_iv_get(self, "@doc_width"));
+  int doc_height = FIX2INT(rb_iv_get(self, "@doc_height"));
+
+  VALUE layer = rb_iv_get(self, "@layer");
+  VALUE canvas = rb_iv_get(self, "@canvas");
+  VALUE mask = rb_funcall(layer, rb_intern("mask"), 0);
+  VALUE *mask_data = RARRAY_PTR(rb_funcall(rb_funcall(layer, rb_intern("image"), 0), rb_intern("mask_data"), 0));
+
+  int mask_height = FIX2INT(rb_funcall(mask, rb_intern("height"), 0));
+  int mask_width = FIX2INT(rb_funcall(mask, rb_intern("width"), 0));
+  int mask_left = FIX2INT(rb_funcall(mask, rb_intern("left"), 0));
+  int mask_top = FIX2INT(rb_funcall(mask, rb_intern("top"), 0));
+
+  int layer_left = FIX2INT(rb_funcall(layer, rb_intern("left"), 0));
+  int layer_top = FIX2INT(rb_funcall(layer, rb_intern("top"), 0));
+
+  PIXEL color;
+  int x, y, doc_x, doc_y, layer_x, layer_y, alpha;
+  int i = 0;
+  for (y = 0; y < mask_height; y++) {
+    for (x = 0; x < mask_width; x++) {
+      doc_x = mask_left + x;
+      doc_y = mask_top + y;
+      layer_x = doc_x - layer_left;
+      layer_y = doc_y - layer_top;
+
+      color = FIX2UINT(rb_funcall(canvas, rb_intern("[]"), 2, INT2FIX(layer_x), INT2FIX(layer_y)));
+
+      if (doc_x < 0 || doc_x >= doc_width || doc_y < 0 || doc_y > doc_height) {
+        alpha = 0;
+      } else {
+        alpha = mask_data[i];
+      }
+
+      color = (color & 0xffffff00) | (A(color) * alpha / 255);
+      rb_funcall(canvas, rb_intern("[]="), 3, INT2FIX(layer_x), INT2FIX(layer_y), INT2FIX(color));
+
+      i++;
+    }
+  }
+
+  return Qnil;
+}

data/ext/psd_native/mask.h

@@ -0,0 +1,6 @@
+#ifndef PSD_NATIVE_MASK
+#define PSD_NATIVE_MASK
+
+VALUE psd_native_mask_apply_bang(VALUE self);
+
+#endif

data/ext/psd_native/psd_native_ext.c

@@ -63,6 +63,10 @@ void Init_psd_native() {
   VALUE ClippingMask = rb_define_module_under(Renderer, "ClippingMask");
   rb_define_method(ClippingMask, "apply!", psd_native_clipping_mask_apply_bang, 0);
 
+  // Mask
+  VALUE Mask = rb_define_module_under(Renderer, "Mask");
+  rb_define_method(Mask, "apply!", psd_native_mask_apply_bang, 0);
+
   // Blender
   VALUE Blender = rb_define_module_under(Renderer, "Blender");
   rb_define_method(Blender, "compose!", psd_native_blender_compose_bang, 0);

data/ext/psd_native/psd_native_ext.h

@@ -14,6 +14,7 @@ typedef uint32_t PIXEL;
 #include "file.h"
 #include "color.h"
 #include "clipping_mask.h"
+#include "mask.h"
 #include "compose.h"
 #include "image_mode_cmyk.h"
 #include "image_mode_greyscale.h"

data/lib/psd_native/version.rb

@@ -1,3 +1,3 @@
 module PSDNative
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/psd_native.rb

@@ -16,6 +16,11 @@ module PSDNative
     end
     base::Renderer::ClippingMask.send(:include, PSDNative::Renderer::ClippingMask)
 
+    base::Renderer::Mask.class_eval do
+      remove_method :apply!
+    end
+    base::Renderer::Mask.send(:include, PSDNative::Renderer::Mask)
+
     base::Renderer::Blender.class_eval do
       remove_method :compose!
     end

data/psd_native.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/psd_native/extconf.rb"]
   spec.require_paths = ["lib", "ext"]
 
-  spec.add_runtime_dependency "psd", ">= 2.0.0"
+  spec.add_runtime_dependency "psd", "~> 2.1.1"
   spec.add_runtime_dependency "oily_png", "~> 1.1"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan LeFevre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,8 @@ files:
 - ext/psd_native/image_mode_rgb.h
 - ext/psd_native/layer_raw.c
 - ext/psd_native/layer_raw.h
+- ext/psd_native/mask.c
+- ext/psd_native/mask.h
 - ext/psd_native/psd_native_ext.c
 - ext/psd_native/psd_native_ext.h
 - ext/psd_native/rle_decoding.c