psd 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d04a7ff525ba486c5d37f11d89b6106c5ae9960a
-  data.tar.gz: 8993d2ce5b328983e55ee77a1ba6297afc37ad0a
+  metadata.gz: 07d04a8de80525605f55cc1346b195d159448da4
+  data.tar.gz: 0eb80cec71da604ffa67e727ad90377b881dd028
 SHA512:
-  metadata.gz: e5da04951ba02c95f1770574a70258736033ff3b9d8b74ede4873592c3ac102fe7972372df4e5ae8f5279d5044c7a475ac5f7de5e86611769d9db59234edf693
-  data.tar.gz: c2e37f8843ff642688c8ea136e28821c51ba8f964368026968301a69046eee757b7b4e48480fe91ff43bd18542d95814046fef9c07cee604aa6f25ad3466393f
+  metadata.gz: 5dab1760c194b6abffe95ee77d061987dfb1d0cf8e7c59375d2f78726c912d36ef786fd5e240d7305d8edefe2f2650fea1546bdfc55b41ce2620d142383ed251
+  data.tar.gz: e04a6725116b6be409215c47fb1d208c7aaacdb4959d84cbc9390d43cd9f2f96378858ac31880be427a02ada478320523a7cec37923bdc7b914d15f7e9d47197

data/README.md

@@ -1,6 +1,6 @@
 # PSD.rb
 
-[![Travis CI](https://travis-ci.org/layervault/psd.rb.png)](https://travis-ci.org/layervault/psd.rb)
+[![Travis CI](https://travis-ci.org/layervault/psd.rb.png?branch=master)](https://travis-ci.org/layervault/psd.rb)
 
 A general purpose Photoshop file parser written in Ruby. It allows you to work with a Photoshop document in a manageable tree structure and find out important data such as:
 

data/lib/psd/image_modes/cmyk.rb

@@ -5,19 +5,11 @@ class PSD
 
       def combine_cmyk_channel
         (0...@num_pixels).step(pixel_step) do |i|
-          if channels == 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]
-          end
+          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 = (channels == 5 ? @channel_data[i + @channel_length * 4] : 255)
 
           rgb = PSD::Color.cmyk_to_rgb(255 - c, 255 - m, 255 - y, 255 - k)
 

data/lib/psd/image_modes/greyscale.rb

@@ -6,8 +6,8 @@ class PSD
       def combine_greyscale_channel
         if channels == 2
           (0...@num_pixels).step(pixel_step) do |i|
-            alpha = @channel_data[i]
-            grey = @channel_data[@channel_length + i]
+            grey = @channel_data[i]
+            alpha = @channel_data[@channel_length + i]
 
             @pixel_data.push ChunkyPNG::Color.greyscale_alpha(grey, alpha)
           end

data/lib/psd/node_group.rb

@@ -21,13 +21,13 @@ class PSD::Node
 
     # Calculated height of this folder.
     def rows
-      @right - @left
+      @bottom - @top
     end
     alias :height :rows
 
     # Calculated width of this folder.
     def cols
-      @bottom - @top
+      @right - @left
     end
     alias :width :cols
 
@@ -70,4 +70,4 @@ class PSD::Node
       @right = @children.map(&:right).max || 0
     end
   end
-end
+end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake