psd 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cbcd0dd708df678b81c59484b465c4e83153dfd
-  data.tar.gz: 3f8a84f7b4a8dd36c1567dd11e8e3c751a22a1a7
+  metadata.gz: c280041aec3dddd0d1d36ffc6ed04a508fee595b
+  data.tar.gz: fb26c8a487af49e440b1f33c1fb22d439ffbe2af
 SHA512:
-  metadata.gz: e66d305e6d0157a0e4c52d2e84ea8a71ace66dbc7cbaea88469a5e1b8dc91e6e87f75e795a0eb3c612c642150b5b2ed3213e6cb45803643707d8ddb270e7d799
-  data.tar.gz: c61813c1eeee66eb8fbe2236462b93fc988f68f864d1f60d88f3135905b0b8ba5bd5a112cdf8855d485e32615c6f1a307658c75843641ac9e160ca7d986c77be
+  metadata.gz: 95b60cce05f150433a0b62eb87bb33cd6a77c437ef49ab133b8c9ad44934f2112a74ef5c3de12f53495857eb252c108af38942737030d65c52bfcc6182ac56f2
+  data.tar.gz: bafa5dd0214d03bd39c34e19218a76d72c33b50bd4a9e2a3e33358be4b8d3a49d344f161a5d8896b5138b7ccbc36c187968fe76b4ba6d558bf63d976bbd7f9da

data/README.md

@@ -217,7 +217,11 @@ PSD.debug = true
 
 You can build previews of any subset or version of the PSD document. This is useful for generating previews of layer comps or exporting individual layer groups as images.
 
+**NOTE: You MUST initialize with the parse_layer_images option set to true, as shown below.**
+
 ``` ruby
+psd = PSD.new(file, parse_layer_images: true)
+
 # Save a layer comp
 psd.tree.filter_by_comp("Version A").save_as_png('./Version A.png')
 

data/lib/psd/clipping_mask.rb

@@ -8,13 +8,10 @@ class PSD
     def apply
       return @png unless @layer.clipped?
 
-      mask = @layer.next_sibling
-
       PSD.logger.debug "Applying clipping mask #{mask.name} to #{@layer.name}"
 
       width, height = @layer.document_dimensions
-      full_png = ChunkyPNG::Canvas.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
-      full_png.compose!(@png, @layer.left, @layer.top)
+      full_png = compose_to_full
 
       height.times do |y|
         width.times do |x|
@@ -28,13 +25,25 @@ class PSD
             alpha = pixel.nil? ? 0 : ChunkyPNG::Color.a(pixel)
           end
           
-          color = ChunkyPNG::Color.to_truecolor_alpha_bytes(full_png[x, y])
-          color[3] = color[3] * alpha / 255
-          full_png[x, y] = ChunkyPNG::Color.rgba(*color)
+          color = full_png[x, y]
+          full_png[x, y] = (color & 0xffffff00) | (ChunkyPNG::Color.a(color) * alpha / 255)
         end
       end
 
       full_png.crop!(@layer.left, @layer.top, @layer.width, @layer.height)
     end
+
+    private
+
+    def mask
+      @mask ||= @layer.next_sibling
+    end
+
+    def compose_to_full
+      width, height = @layer.document_dimensions
+      full_png = ChunkyPNG::Canvas.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
+      full_png.compose!(@png, @layer.left, @layer.top)
+      full_png
+    end
   end
 end

data/lib/psd/compose.rb

@@ -84,9 +84,9 @@ class PSD
 
       mix_alpha, dst_alpha = calculate_alphas(fg, bg, DEFAULT_OPTS.merge(opts))
 
-      new_r = blend_channel(r(bg), r(fg) < (255 - r(bg)) ? 0 : r(fg) - 255 - r(bg), mix_alpha)
-      new_g = blend_channel(g(bg), g(fg) < (255 - g(bg)) ? 0 : g(fg) - 255 - g(bg), mix_alpha)
-      new_b = blend_channel(b(bg), b(fg) < (255 - b(bg)) ? 0 : b(fg) - 255 - b(bg), mix_alpha)
+      new_r = blend_channel(r(bg), (r(fg) < (255 - r(bg))) ? 0 : r(fg) - (255 - r(bg)), mix_alpha)
+      new_g = blend_channel(g(bg), (g(fg) < (255 - g(bg))) ? 0 : g(fg) - (255 - g(bg)), mix_alpha)
+      new_b = blend_channel(b(bg), (b(fg) < (255 - b(bg))) ? 0 : b(fg) - (255 - b(bg)), mix_alpha)
 
       rgba(new_r, new_g, new_b, dst_alpha)
     end

data/lib/psd/nodes/build_preview.rb

@@ -45,8 +45,8 @@ class PSD
         LayerStyles.new(layer, other).apply!
         other = ClippingMask.new(layer, other).apply
 
-        for y in 0...other.height do
-          for x in 0...other.width do
+        other.height.times do |y|
+          other.width.times do |x|
             base_x = x + offset_x
             base_y = y + offset_y
             

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake