psd_native 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c081770f983b87fa68b32f0a04576c8384bce760
-  data.tar.gz: aa04b516926a30d512c22fec87f43524a2eca4b5
+  metadata.gz: 960643fec9eb4c5832460760e567953247189174
+  data.tar.gz: b3000995230c06cad6c95112e30e9be26d70c6aa
 SHA512:
-  metadata.gz: 2d8876e7d2981bdecd7701c3d25adca20b8c5e4cebfc00f7f382ae227477972f3e6174ab60daef81f5713da7cbec490e057ae62e120e327221d13bba7968bd6a
-  data.tar.gz: 03a9c93c7c2ab9d7176909497edf96bcbbb500befeaac3cedc9005ba584bcb072940c9c4dd21b2176d856378c640117811dda1070f4bb789664bd3023d5a9eb9
+  metadata.gz: 9da0d02c2b6eb361f3750d44d370ed165af072e03f0ee91a66721da8e516d23213d93e30586630dca03aeba5ffbf4581cf691caf3c480d21401bede582ed46de
+  data.tar.gz: 5d2fc658099b074118b6890bcf0608a2be393fef2a415e1f2aba389500f6d6386bdb53c70b8ac0fca87214bc276d250e1015961082507f94260c3aacb36bde1c

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+# gem 'psd', git: 'git@github.com:layervault/psd.rb'
+
 # Specify your gem's dependencies in psd_native.gemspec
 gemspec

data/ext/psd_native/build_preview.c

@@ -0,0 +1,58 @@
+#include "psd_native_ext.h"
+
+VALUE psd_native_build_preview_blend_pixels(
+  VALUE self, 
+  VALUE blending_mode, 
+  VALUE layer, 
+  VALUE base, 
+  VALUE other, 
+  VALUE r_offset_x, 
+  VALUE r_offset_y) {
+
+  int x, y, base_x, base_y, offset_x, offset_y;
+  uint32_t width, height, base_width, base_height;
+  VALUE color;
+  VALUE Compose = rb_const_get(rb_const_get(rb_cObject, rb_intern("PSD")), rb_intern("Compose"));
+
+  width = FIX2UINT(rb_funcall(other, rb_intern("width"), 0));
+  height = FIX2UINT(rb_funcall(other, rb_intern("height"), 0));
+  base_width = FIX2UINT(rb_funcall(base, rb_intern("width"), 0));
+  base_height = FIX2UINT(rb_funcall(base, rb_intern("height"), 0));
+  offset_x = FIX2INT(r_offset_x);
+  offset_y = FIX2INT(r_offset_y);
+  
+  VALUE opacity = rb_hash_new();
+  rb_hash_aset(
+    opacity, 
+    ID2SYM(rb_intern("opacity")),
+    rb_funcall(layer, rb_intern("opacity"), 0)
+  );
+
+  rb_hash_aset(
+    opacity,
+    ID2SYM(rb_intern("fill_opacity")),
+    rb_funcall(layer, rb_intern("fill_opacity"), 0)
+  );
+
+  for (y = 0; y < height; y++) {
+    for (x = 0; x < width; x++) {
+      base_x = x + offset_x;
+      base_y = y + offset_y;
+
+      if (base_x < 0 || base_y < 0 || base_x >= base_width || base_y >= base_height) continue;
+
+      color = rb_funcall(
+        Compose,
+        rb_intern_str(blending_mode),
+        3,
+        rb_funcall(other, rb_intern("[]"), 2, INT2FIX(x), INT2FIX(y)),
+        rb_funcall(base, rb_intern("[]"), 2, INT2FIX(base_x), INT2FIX(base_y)),
+        opacity
+      );
+
+      rb_funcall(base, rb_intern("[]="), 3, INT2FIX(base_x), INT2FIX(base_y), color);
+    }
+  }
+
+  return Qnil;
+}

data/ext/psd_native/build_preview.h

@@ -0,0 +1,6 @@
+#ifndef PSD_NATIVE_BUILD_PREVIEW
+#define PSD_NATIVE_BUILD_PREVIEW
+
+VALUE psd_native_build_preview_blend_pixels(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
+
+#endif

data/ext/psd_native/image_mode_rgb.c

@@ -12,27 +12,33 @@ VALUE psd_native_combine_rgb_channel(VALUE self) {
   int channel_count = RARRAY_LENINT(rb_iv_get(self, "@channels_info"));
 
   int i, j;
-  uint32_t val, r, g, b, a;
+  uint32_t val, color;
+
+  int channel_ids[channel_count];
+  for (i = 0; i < channel_count; i++) {
+    channel_ids[i] = FIX2INT(rb_hash_aref(channels_info[i], ID2SYM(rb_intern("id"))));
+  }
 
   // Loop through every pixel in the image
   for (i = 0; i < num_pixels; i += pixel_step) {
-    r = g = b = 0;
-    a = 255;
+    color = 0x000000ff;
 
     // And every channel for every pixel
     for (j = 0; j < channel_count; j++) {
+      if (channel_ids[j] == -2) continue;
+
       val = FIX2UINT(channel_data[i + (channel_length * j)]);
 
       // Get the hash containing channel info
-      switch (FIX2INT(rb_hash_aref(channels_info[j], ID2SYM(rb_intern("id"))))) {
-        case -1: a = val; break;
-        case 0:  r = val; break;
-        case 1:  g = val; break;
-        case 2:  b = val; break;
+      switch (channel_ids[j]) {
+        case -1: color = (color & 0xffffff00) | val; break;         // A
+        case 0:  color = (color & 0x00ffffff) | (val << 24); break; // R
+        case 1:  color = (color & 0xff00ffff) | (val << 16); break; // G
+        case 2:  color = (color & 0xffff00ff) | (val << 8); break;  // B
       }
     }
 
-    rb_ary_push(rb_iv_get(self, "@pixel_data"), INT2FIX(BUILD_PIXEL(r, g, b, a)));
+    rb_ary_push(rb_iv_get(self, "@pixel_data"), INT2FIX(color));
   }
 
   return Qnil;

data/ext/psd_native/psd_native_ext.c

@@ -1,6 +1,12 @@
 #include "psd_native_ext.h"
 
+static VALUE psd_class;
+static VALUE logger;
+
 void Init_psd_native() {
+  psd_class = rb_const_get(rb_cObject, rb_intern("PSD"));
+  logger = rb_funcall(psd_class, rb_intern("logger"), 0);
+
   VALUE PSDNative = rb_define_module("PSDNative");
   VALUE ImageMode = rb_define_module_under(PSDNative, "ImageMode");
 
@@ -49,15 +55,22 @@ void Init_psd_native() {
   VALUE ClippingMask = rb_define_module_under(PSDNative, "ClippingMask");
   rb_define_method(ClippingMask, "apply", psd_native_clipping_mask_apply, 0);
 
-  psd_logger("info", "PSD native mixins enabled!");
-}
+  // Build preview
+  VALUE Node = rb_define_module_under(PSDNative, "Node");
+  VALUE BuildPreview = rb_define_module_under(Node, "BuildPreview");
+  rb_define_private_method(BuildPreview, "blend_pixels!", psd_native_build_preview_blend_pixels, 6);
+
+  // Util
+  VALUE Util = rb_define_module_under(PSDNative, "Util");
+  rb_define_method(Util, "pad2", psd_native_util_pad2, 1);
+  rb_define_method(Util, "pad4", psd_native_util_pad4, 1);
+  rb_define_method(Util, "clamp", psd_native_util_clamp, 3);
 
-VALUE psd_class() {
-  return rb_const_get(rb_cObject, rb_intern("PSD"));
+  psd_logger("info", "PSD native mixins enabled!");
 }
 
 void psd_logger(char* level, char* message) {
-  rb_funcall(rb_funcall(psd_class(), rb_intern("logger"), 0), rb_intern(level), 1, rb_str_new2(message));
+  rb_funcall(logger, rb_intern(level), 1, rb_str_new2(message));
 }
 
 VALUE psd_file(VALUE self) {

data/ext/psd_native/psd_native_ext.h

@@ -4,12 +4,14 @@
 #include "ruby.h"
 
 #define RSTRING_NOT_MODIFIED
+#define PSD_CONCURRENCY 4
 
 // Pixels use 32 bits unsigned integers
 // We borrow this from OilyPNG
 typedef uint32_t PIXEL;
 
 // Our native mixins
+#include "util.h"
 #include "color.h"
 #include "clipping_mask.h"
 #include "compose.h"
@@ -17,9 +19,10 @@ typedef uint32_t PIXEL;
 #include "image_mode_greyscale.h"
 #include "image_mode_rgb.h"
 #include "rle_decoding.h"
+#include "build_preview.h"
 
 void Init_psd_native();
-VALUE psd_class();
+// VALUE psd_class();
 void psd_logger(char* level, char* message);
 VALUE psd_file(VALUE self);
 int psd_file_tell(VALUE self);

data/ext/psd_native/util.c

@@ -0,0 +1,17 @@
+#include "psd_native_ext.h"
+
+VALUE psd_native_util_pad2(VALUE self, VALUE i) {
+  return INT2FIX((FIX2INT(i) + 1) & ~0x01);
+}
+
+VALUE psd_native_util_pad4(VALUE self, VALUE i) {
+  return INT2FIX(((FIX2INT(i) + 4) & ~0x03) - 1);
+}
+
+VALUE psd_native_util_clamp(VALUE self, VALUE r_num, VALUE r_min, VALUE r_max) {
+  int num = FIX2INT(r_num);
+  int min = FIX2INT(r_min);
+  int max = FIX2INT(r_max);
+
+  return num > max ? r_max : (num < min ? r_min : r_num);
+}

data/ext/psd_native/util.h

@@ -0,0 +1,8 @@
+#ifndef PSD_NATIVE_UTIL
+#define PSD_NATIVE_UTIL
+
+VALUE psd_native_util_pad2(VALUE self, VALUE i);
+VALUE psd_native_util_pad4(VALUE self, VALUE i);
+VALUE psd_native_util_clamp(VALUE self, VALUE num, VALUE min, VALUE max);
+
+#endif

data/lib/psd_native/version.rb

@@ -1,3 +1,3 @@
 module PSDNative
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/psd_native.rb

@@ -7,6 +7,8 @@ module PSDNative
     base::Image.send(:include, PSDNative::ImageMode::Greyscale)
     base::Image.send(:include, PSDNative::ImageFormat::RLE)
     base::Color.send(:include, PSDNative::Color)
+    base::Node.send(:include, PSDNative::Node::BuildPreview)
+    base::Util.extend PSDNative::Util
 
     base::ClippingMask.class_eval do
       remove_method :apply

data/spec/util_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'Util' do
+  it "pad2's correctly" do
+    expect(PSD::Util.pad2(0)).to eq 0
+    expect(PSD::Util.pad2(1)).to eq 2
+  end
+  
+  # Note, this pad4 is weird but this is expected results
+  it "pad4's correctly" do
+    expect(PSD::Util.pad4(0)).to eq 3
+    expect(PSD::Util.pad4(1)).to eq 3
+    expect(PSD::Util.pad4(2)).to eq 3
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan LeFevre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-18 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psd
@@ -137,6 +137,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/psd_native/build_preview.c
+- ext/psd_native/build_preview.h
 - ext/psd_native/clipping_mask.c
 - ext/psd_native/clipping_mask.h
 - ext/psd_native/color.c
@@ -154,6 +156,8 @@ files:
 - ext/psd_native/psd_native_ext.h
 - ext/psd_native/rle_decoding.c
 - ext/psd_native/rle_decoding.h
+- ext/psd_native/util.c
+- ext/psd_native/util.h
 - lib/psd_native.rb
 - lib/psd_native/compose.rb
 - lib/psd_native/version.rb
@@ -167,6 +171,7 @@ files:
 - spec/image_spec.rb
 - spec/psd_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb
 homepage: http://cosmos.layervault.com/psdrb.html
 licenses:
 - MIT
@@ -188,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.8
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Native C mixins to speed up the slowest parts of PSD.rb
@@ -202,3 +207,4 @@ test_files:
 - spec/image_spec.rb
 - spec/psd_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb