psd_native 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea6a18568c0167e52edc9898e46cf1c3ca7fa191
-  data.tar.gz: c1cb23a65ca6bb18cd23b87d6ed21f224b1ccba4
+  metadata.gz: 6a097861634857452e319eac2dc9b273f5152995
+  data.tar.gz: cdaa91f6470f0403cf4c551fbc6d7bae936604e7
 SHA512:
-  metadata.gz: a13bc0db5675474519811a44b298bb94b68ae72f32fa300aa36864e973d35c56c3f6489ccd3153418aaccb3bd09e4d56243107d8b6fd51c98c4f1b9198224111
-  data.tar.gz: 8106d269a32bd68cb67aa8980018036dd68b2eed9946adf18c67902ace34e760a19c71bb8885a5fcc864041dfed3c47bec4bad7cd5d0ad24b1f120f389c5a903
+  metadata.gz: 9aeb904cc861e840673e1ce5e5a47d55e1dbcf50a3af58d05ae827fef0a7f5681489fe234e100644c1aa33a39dd208f5e2c6b1627f85f5179882c1ea5296c242
+  data.tar.gz: 05ad35fb96d4b7a85a113e2927ee948fb33e75fa1d5c9699f93a1a8aeecf518c06a575ee922aa2ea17c88d2826504b5d2eeaf8710242c0b834e24e6347205d3b

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -1,11 +1,15 @@
 # PSDNative
 
+[![Travis CI](https://travis-ci.org/layervault/psd_native.png)](https://travis-ci.org/layervault/psd_native)
+
 A gem that includes multiple mixins that speed up [PSD.rb](https://github.com/layervault/psd.rb) by delegating certain parts of the library to native C code. This library allows for PSD.rb to function as a pure Ruby library, while allowing for optional native code speed improvements. It overwrites specific methods within PSD.rb transparently, so you can use PSD.rb like normal.
 
 Currently, PSDNative replaces these sections of PSD.rb with native code:
 
 * RGB processing
+* CMYK processing
 * RLE decoding
+* Some color conversions
 
 ## Installation
 

data/Rakefile

@@ -1,7 +1,13 @@
 require "bundler/gem_tasks"
 require "rake/extensiontask"
+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"'
 end
+
+Rake::Task['spec'].prerequisites << :compile
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/ext/psd_native/color.c

@@ -0,0 +1,20 @@
+#include "psd_native_ext.h"
+
+VALUE psd_native_cmyk_to_rgb(VALUE self, VALUE c, VALUE m, VALUE y, VALUE k) {
+  int r, g, b;
+
+  r = psd_clamp_int((65535 - (FIX2INT(c) * (255 - FIX2INT(k)) + (FIX2INT(k) << 8))) >> 8, 0, 255);
+  g = psd_clamp_int((65535 - (FIX2INT(m) * (255 - FIX2INT(k)) + (FIX2INT(k) << 8))) >> 8, 0, 255);
+  b = psd_clamp_int((65535 - (FIX2INT(y) * (255 - FIX2INT(k)) + (FIX2INT(k) << 8))) >> 8, 0, 255);
+
+  VALUE result = rb_hash_new();
+  rb_hash_aset(result, ID2SYM(rb_intern("r")), INT2FIX(r));
+  rb_hash_aset(result, ID2SYM(rb_intern("g")), INT2FIX(g));
+  rb_hash_aset(result, ID2SYM(rb_intern("b")), INT2FIX(b));
+
+  return result;
+}
+
+int psd_clamp_int(int n, int low, int high) {
+  return n < low ? low : (n > high ? high : n);
+}

data/ext/psd_native/color.h

@@ -0,0 +1,7 @@
+#ifndef PSD_NATIVE_COLOR
+#define PSD_NATIVE_COLOR
+
+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);
+
+#endif

data/ext/psd_native/image_mode_cmyk.c

@@ -0,0 +1,50 @@
+#include "psd_native_ext.h"
+
+VALUE psd_native_combine_cmyk_channel(VALUE self) {
+  psd_logger("debug", "Beginning CMYK processing");
+  
+  uint32_t num_pixels = FIX2UINT(rb_iv_get(self, "@num_pixels"));
+  uint32_t pixel_step = FIX2UINT(rb_funcall(self, rb_intern("pixel_step"), 0));
+
+  VALUE* channel_data = RARRAY_PTR(rb_iv_get(self, "@channel_data"));
+  uint32_t channel_length = FIX2UINT(rb_iv_get(self, "@channel_length"));
+  uint32_t channel_count = FIX2UINT(rb_funcall(self, rb_intern("channels"), 0));
+
+  int i;
+  uint32_t r, g, b;
+  VALUE a, c, m, y, k, rgb;
+
+  // Loop through every pixel in the image
+  for (i = 0; i < num_pixels; i += pixel_step) {
+    if (channel_count == 5) {
+      a = channel_data[i];
+      c = channel_data[i + channel_length];
+      m = channel_data[i + channel_length * 2];
+      y = channel_data[i + channel_length * 3];
+      k = channel_data[i + channel_length * 4];
+    } else {
+      a = 255;
+      c = channel_data[i];
+      m = channel_data[i + channel_length];
+      y = channel_data[i + channel_length * 2];
+      k = channel_data[i + channel_length * 3];
+    }
+
+    rgb = psd_native_cmyk_to_rgb(
+      self, 
+      INT2FIX(255 - FIX2INT(c)), 
+      INT2FIX(255 - FIX2INT(m)), 
+      INT2FIX(255 - FIX2INT(y)),
+      INT2FIX(255 - FIX2INT(k))
+    );
+
+
+    r = FIX2UINT(rb_hash_aref(rgb, ID2SYM(rb_intern("r"))));
+    g = FIX2UINT(rb_hash_aref(rgb, ID2SYM(rb_intern("g"))));
+    b = FIX2UINT(rb_hash_aref(rgb, ID2SYM(rb_intern("b"))));
+
+    rb_ary_push(rb_iv_get(self, "@pixel_data"), INT2FIX(BUILD_PIXEL(r, g, b, a)));
+  }
+
+  return Qnil;
+}

data/ext/psd_native/image_mode_cmyk.h

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

data/ext/psd_native/image_mode_rgb.c

@@ -6,10 +6,10 @@ VALUE psd_native_combine_rgb_channel(VALUE self) {
   uint32_t num_pixels = FIX2UINT(rb_iv_get(self, "@num_pixels"));
   uint32_t pixel_step = FIX2UINT(rb_funcall(self, rb_intern("pixel_step"), 0));
 
-  VALUE channels_info = rb_iv_get(self, "@channels_info");
-  VALUE channel_data = rb_iv_get(self, "@channel_data");
+  VALUE* channels_info = RARRAY_PTR(rb_iv_get(self, "@channels_info"));
+  VALUE* channel_data = RARRAY_PTR(rb_iv_get(self, "@channel_data"));
   uint32_t channel_length = FIX2UINT(rb_iv_get(self, "@channel_length"));
-  uint32_t channel_count = FIX2UINT(rb_funcall(channels_info, rb_intern("length"), 0));
+  int channel_count = RARRAY_LENINT(rb_iv_get(self, "@channels_info"));
 
   int i, j;
   uint32_t val, r, g, b, a;
@@ -21,10 +21,10 @@ VALUE psd_native_combine_rgb_channel(VALUE self) {
 
     // And every channel for every pixel
     for (j = 0; j < channel_count; j++) {
-      val = FIX2UINT(rb_ary_entry(channel_data, i + (channel_length * j)));
+      val = FIX2UINT(channel_data[i + (channel_length * j)]);
 
       // Get the hash containing channel info
-      switch (FIX2INT(rb_hash_aref(rb_ary_entry(channels_info, j), ID2SYM(rb_intern("id"))))) {
+      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;

data/ext/psd_native/image_mode_rgb.h

@@ -1,8 +1,6 @@
 #ifndef PSD_NATIVE_RGB
 #define PSD_NATIVE_RGB
 
-#define BUILD_PIXEL(r, g, b, a)  (((PIXEL) (r) << 24) + ((PIXEL) (g) << 16) + ((PIXEL) (b) << 8) + (PIXEL) (a))
-
 VALUE psd_native_combine_rgb_channel(VALUE self);
 
 #endif

data/ext/psd_native/psd_native_ext.c

@@ -8,11 +8,19 @@ void Init_psd_native() {
   VALUE ImageMode_RGB = rb_define_module_under(ImageMode, "RGB");
   rb_define_private_method(ImageMode_RGB, "combine_rgb_channel", psd_native_combine_rgb_channel, 0);
 
+  // CMYK Processing
+  VALUE ImageMode_CMYK = rb_define_module_under(ImageMode, "CMYK");
+  rb_define_private_method(ImageMode_CMYK, "combine_cmyk_channel", psd_native_combine_cmyk_channel, 0);
+
   // RLE decoding
   VALUE ImageFormat = rb_define_module_under(PSDNative, "ImageFormat");
   VALUE RLE = rb_define_module_under(ImageFormat, "RLE");
   rb_define_private_method(RLE, "decode_rle_channel", psd_native_decode_rle_channel, 0);
 
+  // Color functions
+  VALUE Color = rb_define_module_under(PSDNative, "Color");
+  rb_define_singleton_method(Color, "cmyk_to_rgb", psd_native_cmyk_to_rgb, 4);
+
   psd_logger("info", "PSD native mixins enabled!");
 }
 

data/ext/psd_native/psd_native_ext.h

@@ -8,10 +8,13 @@
 // Pixels use 32 bits unsigned integers
 // We borrow this from OilyPNG
 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 "image_mode_cmyk.h"
 #include "rle_decoding.h"
+#include "color.h"
 
 void Init_psd_native();
 VALUE psd_class();

data/lib/psd_native/color.rb

@@ -0,0 +1,13 @@
+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

data/lib/psd_native/version.rb

@@ -1,3 +1,3 @@
 module PSDNative
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/psd_native.rb

@@ -1,14 +1,15 @@
 require "psd"
-require "psd_native/version"
-require "psd_native/psd_native"
 
 module PSDNative
   def self.included(base)
     base::Image.send(:include, PSDNative::ImageMode::RGB)
-
-    # Disabled until optimized
+    base::Image.send(:include, PSDNative::ImageMode::CMYK)
     base::Image.send(:include, PSDNative::ImageFormat::RLE)
   end
 end
 
+require "psd_native/version"
+require "psd_native/psd_native"
+require "psd_native/color"
+
 PSD.send :include, PSDNative

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -131,12 +131,17 @@ extensions:
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/psd_native/color.c
+- ext/psd_native/color.h
 - ext/psd_native/extconf.rb
+- ext/psd_native/image_mode_cmyk.c
+- ext/psd_native/image_mode_cmyk.h
 - ext/psd_native/image_mode_rgb.c
 - ext/psd_native/image_mode_rgb.h
 - ext/psd_native/psd_native_ext.c
@@ -144,6 +149,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/version.rb
 - psd_native.gemspec
 - spec/files/example.psd