psd_native 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc8f941614e4d6e7a4f3262d95a6d46b81a226f
-  data.tar.gz: b8085ead0d1a7977ba66806109c31b8e57fa836c
+  metadata.gz: 43ce99138b4b79f02a2f05ac620b2cb74572fea3
+  data.tar.gz: 2b003b13301a2009dc8ed4668435bd60a77a60ec
 SHA512:
-  metadata.gz: 039e4149c2182f105ab85cd8a67442e099edb4bc48f230aa7f9e54021439bdafbef60f7b9d848c074ec0fd2c98b5bab9732c4de60199ce34576ac445ce584382
-  data.tar.gz: a1910ddae6d3cb053e7c4acafa12cff2125427e8f43832ffb90b79fc34c576960641e3b65f84524aa1996da7b3716eacb0e6e9c90211c791c02dee9907ca22b5
+  metadata.gz: 2be538272093186445f346678e4e589715182d37a870f3dc13b075d55d226e835d55fd56e9f21bd17e424e484ee7007ced0f7d0f70fefd09cede853d40f18861
+  data.tar.gz: dedc579ccb2b5c9fdbd867c0badab4aebff2bb3e55d2d64c3484d0915b9f2ddee8c281e595d92fe943b3954d90cf6e452ada0f7203b647af9965464d99f4ef50

data/Rakefile

@@ -4,7 +4,7 @@ require 'rspec/core/rake_task'
 
 Rake::ExtensionTask.new('psd_native') do |ext|
   ext.lib_dir = File.join('lib', 'psd_native')
-  ext.config_options = '--with-cflags="-std=c99 -openmp"'
+  ext.config_options = '--with-cflags="-std=c99"'
 end
 
 Rake::Task['spec'].prerequisites << :compile

data/ext/psd_native/color.c

@@ -17,4 +17,32 @@ VALUE psd_native_cmyk_to_rgb(VALUE self, VALUE c, VALUE m, VALUE y, VALUE k) {
 
 int psd_clamp_int(int n, int low, int high) {
   return n < low ? low : (n > high ? high : n);
+}
+
+int opaque(uint32_t color) {
+  return a(color) == 0x000000ff;
+}
+
+int transparent(uint32_t color) {
+  return a(color) == 0x00000000;
+}
+
+uint32_t r(uint32_t color) {
+  return (color & 0xff000000) >> 24;
+}
+
+uint32_t g(uint32_t color) {
+  return (color & 0x00ff0000) >> 16;
+}
+
+uint32_t b(uint32_t color) {
+  return (color & 0x0000ff00) >> 8;
+}
+
+uint32_t a(uint32_t color) {
+  return color & 0x000000ff;
+}
+
+uint32_t rgba(uint32_t r, uint32_t g, uint32_t b, uint32_t a) {
+  return r << 24 | g << 16 | b << 8 | a;
 }

data/ext/psd_native/color.h

@@ -3,5 +3,12 @@
 
 VALUE psd_native_cmyk_to_rgb(VALUE self, VALUE c, VALUE m, VALUE y, VALUE k);
 int psd_clamp_int(int n, int low, int high);
+int opaque(uint32_t color);
+int transparent(uint32_t color);
+uint32_t r(uint32_t color);
+uint32_t g(uint32_t color);
+uint32_t b(uint32_t color);
+uint32_t a(uint32_t color);
+uint32_t rgba(uint32_t r, uint32_t g, uint32_t b, uint32_t a);
 
 #endif

data/ext/psd_native/compose.c

@@ -0,0 +1,40 @@
+#include "psd_native_ext.h"
+
+AlphaValues alpha;
+
+VALUE psd_native_compose_normal(VALUE self, VALUE r_fg, VALUE r_bg, VALUE opts) {
+  uint32_t fg = FIX2UINT(r_fg);
+  uint32_t bg = FIX2UINT(r_bg);
+  uint32_t new_r, new_g, new_b;
+
+  if (opaque(fg) || transparent(bg)) return INT2FIX(fg);
+  if (transparent(fg)) return INT2FIX(bg);
+
+  calculate_alphas(fg, bg, &opts);
+
+  new_r = blend_channel(r(bg), r(fg), alpha.mix);
+  new_g = blend_channel(g(bg), g(fg), alpha.mix);
+  new_b = blend_channel(b(bg), b(fg), alpha.mix);
+
+  return INT2FIX(rgba(new_r, new_g, new_b, alpha.dst));
+}
+
+void calculate_alphas(uint32_t fg, uint32_t bg, VALUE *opts) {
+  uint32_t opacity = calculate_opacity(opts);
+  uint32_t src_alpha = a(fg) * opacity >> 8;
+
+  alpha.dst = a(bg);
+  alpha.mix = (src_alpha << 8) / (src_alpha + ((256 - src_alpha) * alpha.dst >> 8));
+  alpha.dst = alpha.dst + ((256 - alpha.dst) * src_alpha >> 8);
+}
+
+uint32_t calculate_opacity(VALUE *opts) {
+  uint32_t opacity = FIX2UINT(rb_hash_aref(*opts, ID2SYM(rb_intern("opacity"))));
+  uint32_t fill_opacity = FIX2UINT(rb_hash_aref(*opts, ID2SYM(rb_intern("fill_opacity"))));
+
+  return opacity * fill_opacity / 255;
+}
+
+uint32_t blend_channel(uint32_t bg, uint32_t fg, uint32_t a) {
+  return ((bg << 8) + (fg - bg) * a) >> 8;
+}

data/ext/psd_native/compose.h

@@ -0,0 +1,14 @@
+#ifndef PSD_NATIVE_COMPOSE
+#define PSD_NATIVE_COMPOSE
+
+typedef struct AlphaValues {
+  int mix;
+  int dst;
+} AlphaValues;
+
+VALUE psd_native_compose_normal(VALUE self, VALUE fg, VALUE bg, VALUE opts);
+void calculate_alphas(uint32_t fg, uint32_t bg, VALUE *opts);
+uint32_t calculate_opacity(VALUE *opts);
+uint32_t blend_channel(uint32_t bg, uint32_t fg, uint32_t a);
+
+#endif

data/ext/psd_native/psd_native_ext.c

@@ -23,7 +23,11 @@ void Init_psd_native() {
 
   // Color functions
   VALUE Color = rb_define_module_under(PSDNative, "Color");
-  rb_define_singleton_method(Color, "cmyk_to_rgb", psd_native_cmyk_to_rgb, 4);
+  rb_define_module_function(Color, "cmyk_to_rgb", psd_native_cmyk_to_rgb, 4);
+
+  // Compose functions
+  VALUE Compose = rb_define_module_under(PSDNative, "Compose");
+  rb_define_module_function(Compose, "normal", psd_native_compose_normal, 3);
 
   psd_logger("info", "PSD native mixins enabled!");
 }

data/ext/psd_native/psd_native_ext.h

@@ -11,11 +11,12 @@ typedef uint32_t PIXEL;
 #define BUILD_PIXEL(r, g, b, a)  (((PIXEL) (r) << 24) + ((PIXEL) (g) << 16) + ((PIXEL) (b) << 8) + (PIXEL) (a))
 
 // Our native mixins
-#include "image_mode_rgb.h"
+#include "color.h"
+#include "compose.h"
 #include "image_mode_cmyk.h"
 #include "image_mode_greyscale.h"
+#include "image_mode_rgb.h"
 #include "rle_decoding.h"
-#include "color.h"
 
 void Init_psd_native();
 VALUE psd_class();

data/lib/psd_native/compose.rb

@@ -0,0 +1,11 @@
+require 'psd'
+require 'psd_native/psd_native'
+
+class PSD
+  module Compose
+    def normal(fg, bg, opts={})
+      opts = DEFAULT_OPTS.merge(opts)
+      PSDNative::Compose.normal(fg, bg, opts)
+    end
+  end
+end

data/lib/psd_native/version.rb

@@ -1,3 +1,3 @@
 module PSDNative
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/psd_native.rb

@@ -6,11 +6,12 @@ module PSDNative
     base::Image.send(:include, PSDNative::ImageMode::CMYK)
     base::Image.send(:include, PSDNative::ImageMode::Greyscale)
     base::Image.send(:include, PSDNative::ImageFormat::RLE)
+    base::Color.send(:include, PSDNative::Color)
   end
 end
 
 require "psd_native/version"
 require "psd_native/psd_native"
-require "psd_native/color"
+require "psd_native/compose"
 
 PSD.send :include, PSDNative

data/psd_native.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.extensions    = ["ext/psd_native/extconf.rb"]
   spec.require_paths = ["lib", "ext"]
 
-  spec.add_runtime_dependency "psd", "~> 1.2"
+  spec.add_runtime_dependency "psd", ">= 1.4"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryan LeFevre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +139,8 @@ files:
 - Rakefile
 - ext/psd_native/color.c
 - ext/psd_native/color.h
+- ext/psd_native/compose.c
+- ext/psd_native/compose.h
 - ext/psd_native/extconf.rb
 - ext/psd_native/image_mode_cmyk.c
 - ext/psd_native/image_mode_cmyk.h
@@ -151,7 +153,7 @@ files:
 - ext/psd_native/rle_decoding.c
 - ext/psd_native/rle_decoding.h
 - lib/psd_native.rb
-- lib/psd_native/color.rb
+- lib/psd_native/compose.rb
 - lib/psd_native/version.rb
 - psd_native.gemspec
 - spec/files/example.psd

data/lib/psd_native/color.rb

@@ -1,13 +0,0 @@
-require 'psd'
-require 'psd_native/psd_native'
-
-class PSD
-  class Color
-    instance_eval do
-      alias :old_cmyk_to_rgb :cmyk_to_rgb
-      def cmyk_to_rgb(*args)
-        PSDNative::Color.cmyk_to_rgb(*args)
-      end
-    end
-  end
-end