psd_native 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a097861634857452e319eac2dc9b273f5152995
-  data.tar.gz: cdaa91f6470f0403cf4c551fbc6d7bae936604e7
+  metadata.gz: 4bc8f941614e4d6e7a4f3262d95a6d46b81a226f
+  data.tar.gz: b8085ead0d1a7977ba66806109c31b8e57fa836c
 SHA512:
-  metadata.gz: 9aeb904cc861e840673e1ce5e5a47d55e1dbcf50a3af58d05ae827fef0a7f5681489fe234e100644c1aa33a39dd208f5e2c6b1627f85f5179882c1ea5296c242
-  data.tar.gz: 05ad35fb96d4b7a85a113e2927ee948fb33e75fa1d5c9699f93a1a8aeecf518c06a575ee922aa2ea17c88d2826504b5d2eeaf8710242c0b834e24e6347205d3b
+  metadata.gz: 039e4149c2182f105ab85cd8a67442e099edb4bc48f230aa7f9e54021439bdafbef60f7b9d848c074ec0fd2c98b5bab9732c4de60199ce34576ac445ce584382
+  data.tar.gz: a1910ddae6d3cb053e7c4acafa12cff2125427e8f43832ffb90b79fc34c576960641e3b65f84524aa1996da7b3716eacb0e6e9c90211c791c02dee9907ca22b5

data/README.md

@@ -8,6 +8,7 @@ Currently, PSDNative replaces these sections of PSD.rb with native code:
 
 * RGB processing
 * CMYK processing
+* Greyscale processing
 * RLE decoding
 * Some color conversions
 

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"'
+  ext.config_options = '--with-cflags="-std=c99 -openmp"'
 end
 
 Rake::Task['spec'].prerequisites << :compile

data/ext/psd_native/image_mode_cmyk.c

@@ -16,19 +16,11 @@ VALUE psd_native_combine_cmyk_channel(VALUE self) {
 
   // 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];
-    }
+    c = channel_data[i];
+    m = channel_data[i + channel_length];
+    y = channel_data[i + channel_length * 2];
+    k = channel_data[i + channel_length * 3];
+    a = (channel_count == 5 ? channel_data[i + channel_length * 4] : 255);
 
     rgb = psd_native_cmyk_to_rgb(
       self, 

data/ext/psd_native/image_mode_cmyk.h

@@ -1,5 +1,5 @@
-#ifndef PSD_NATIVE_CMYK
-#define PSD_NATIVE_CMYK
+#ifndef PSD_NATIVE_IMAGE_MODE_CMYK
+#define PSD_NATIVE_IMAGE_MODE_CMYK
 
 VALUE psd_native_combine_cmyk_channel(VALUE self);
 

data/ext/psd_native/image_mode_greyscale.c

@@ -0,0 +1,27 @@
+#include "psd_native_ext.h"
+
+VALUE psd_native_combine_greyscale_channel(VALUE self) {
+  psd_logger("debug", "Beginning greyscale processing");
+
+  uint32_t channel_count = FIX2UINT(rb_funcall(self, rb_intern("channels"), 0));
+  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 i, alpha, grey;
+  for (i = 0; i < num_pixels; i += pixel_step) {
+    if (channel_count == 2) {
+      grey = FIX2UINT(channel_data[i]);
+      alpha = FIX2UINT(channel_data[channel_length + i]);
+
+      rb_ary_push(rb_iv_get(self, "@pixel_data"), INT2FIX(BUILD_PIXEL(grey, grey, grey, alpha)));
+    } else {
+      grey = FIX2UINT(channel_data[i]);
+      rb_ary_push(rb_iv_get(self, "@pixel_data"), INT2FIX(BUILD_PIXEL(grey, grey, grey, 255)));
+    }
+  }
+
+  return Qnil;
+}

data/ext/psd_native/image_mode_greyscale.h

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

data/ext/psd_native/image_mode_rgb.h

@@ -1,5 +1,5 @@
-#ifndef PSD_NATIVE_RGB
-#define PSD_NATIVE_RGB
+#ifndef PSD_NATIVE_IMAGE_MODE_RGB
+#define PSD_NATIVE_IMAGE_MODE_RGB
 
 VALUE psd_native_combine_rgb_channel(VALUE self);
 

data/ext/psd_native/psd_native_ext.c

@@ -12,6 +12,10 @@ void Init_psd_native() {
   VALUE ImageMode_CMYK = rb_define_module_under(ImageMode, "CMYK");
   rb_define_private_method(ImageMode_CMYK, "combine_cmyk_channel", psd_native_combine_cmyk_channel, 0);
 
+  // Greyscale Processing
+  VALUE ImageMode_Greyscale = rb_define_module_under(ImageMode, "Greyscale");
+  rb_define_private_method(ImageMode_Greyscale, "combine_greyscale_channel", psd_native_combine_greyscale_channel, 0);
+
   // RLE decoding
   VALUE ImageFormat = rb_define_module_under(PSDNative, "ImageFormat");
   VALUE RLE = rb_define_module_under(ImageFormat, "RLE");

data/ext/psd_native/psd_native_ext.h

@@ -13,6 +13,7 @@ typedef uint32_t PIXEL;
 // Our native mixins
 #include "image_mode_rgb.h"
 #include "image_mode_cmyk.h"
+#include "image_mode_greyscale.h"
 #include "rle_decoding.h"
 #include "color.h"
 

data/lib/psd_native/version.rb

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

data/lib/psd_native.rb

@@ -4,6 +4,7 @@ module PSDNative
   def self.included(base)
     base::Image.send(:include, PSDNative::ImageMode::RGB)
     base::Image.send(:include, PSDNative::ImageMode::CMYK)
+    base::Image.send(:include, PSDNative::ImageMode::Greyscale)
     base::Image.send(:include, PSDNative::ImageFormat::RLE)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psd_native
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ryan LeFevre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psd
@@ -142,6 +142,8 @@ files:
 - ext/psd_native/extconf.rb
 - ext/psd_native/image_mode_cmyk.c
 - ext/psd_native/image_mode_cmyk.h
+- ext/psd_native/image_mode_greyscale.c
+- ext/psd_native/image_mode_greyscale.h
 - ext/psd_native/image_mode_rgb.c
 - ext/psd_native/image_mode_rgb.h
 - ext/psd_native/psd_native_ext.c