psd 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f9c53ce033fdba16caf70bf522d538ced6658f4
-  data.tar.gz: bd3827fcd93cf3a44c517b8e76504e4b7302fad0
+  metadata.gz: e989ef2453ff6c7b5e1c5e78590921ba53c679d6
+  data.tar.gz: 7b4dadc4460ad50512119776d4ca3e97f30782a9
 SHA512:
-  metadata.gz: f5e146a36e2630d1833ab163dee71137cc469c46f2fbe6c766f2b170a182e33974cb911208c0fb7b9e9ffac62a97c764c07b6e9ba3eb77a5ab9459f72b01d395
-  data.tar.gz: 04f8f7140acfc9c972432723721603bc4650572e526bae647da386308b49a6fa734447149a945a6f1bbbd90e3428365cd280f4dbfd389d7c140784fc7e8a1b0e
+  metadata.gz: 219a65e3412907b5672831101ad86bc7ba900dee53f571261cae77a39137589028c170950f52b85e477b039aa596840abb35a6ce0506d515e7866162390eec56
+  data.tar.gz: 5b8436682d202ceaa47e75dccdd59470f868231473cb91c8212aefb35ed2024dfa709adddd8b650b17d8411561dfb12dadb1afeb63445aefecc64fdaea1b9780

data/lib/psd/image_exports/png.rb

@@ -36,7 +36,12 @@ class PSD::Image
         i = 0
         @layer.height.times do |y|
           @layer.width.times do |x|
-            png[x + @layer.left, y + @layer.top] = @pixel_data[i]
+            offset_x = x + @layer.left
+            offset_y = y + @layer.top
+
+            i +=1 and next if offset_x < 0 || offset_y < 0 || offset_x >= png.width || offset_y >= png.height
+
+            png[offset_x, offset_y] = @pixel_data[i]
             i += 1
           end
         end
@@ -48,15 +53,22 @@ class PSD::Image
             offset_x = @layer.mask.left + x
             offset_y = @layer.mask.top + y
 
-            color = ChunkyPNG::Color.to_truecolor_alpha_bytes(png.get_pixel(offset_x, offset_y))
+            i += 1 and next if offset_x < 0 || offset_y < 0 || offset_x >= png.width || offset_y >= png.height
+
+            color = ChunkyPNG::Color.to_truecolor_alpha_bytes(png[offset_x, offset_y])
             color[3] = color[3] * @mask_data[i] / 255
 
-            png.set_pixel(offset_x, offset_y, ChunkyPNG::Color.rgba(*color))
+            png[offset_x, offset_y] = ChunkyPNG::Color.rgba(*color)
             i += 1
           end
         end
 
-        png.crop!(@layer.left, @layer.top, @layer.width.to_i, @layer.height.to_i)
+        crop_left = PSD::Util.clamp(@layer.left, 0, png.width)
+        crop_top = PSD::Util.clamp(@layer.top, 0, png.height)
+        crop_width = PSD::Util.clamp(@layer.width.to_i, 0, png.width - crop_left)
+        crop_height = PSD::Util.clamp(@layer.height.to_i, 0, png.height - crop_top)
+
+        png.crop!(crop_left, crop_top, crop_width, crop_height)
       end
 
       def mask_to_png

data/lib/psd/image_modes/greyscale.rb

@@ -9,11 +9,11 @@ class PSD
             grey = @channel_data[i]
             alpha = @channel_data[@channel_length + i]
 
-            @pixel_data.push ChunkyPNG::Color.greyscale_alpha(grey, alpha)
+            @pixel_data.push ChunkyPNG::Color.grayscale_alpha(grey, alpha)
           end
         else
           (0...@num_pixels).step(pixel_step) do |i|
-            @pixel_data.push ChunkyPNG::Color.greyscale(@channel_data[i])
+            @pixel_data.push ChunkyPNG::Color.grayscale(@channel_data[i])
           end
         end
       end

data/lib/psd/image_modes/rgb.rb

@@ -10,7 +10,6 @@ class PSD
         (0...@num_pixels).step(pixel_step) do |i|
           r = g = b = 0
           a = 255
-          mask = nil
 
           @channels_info.each_with_index do |chan, index|
             next if chan[:id] == -2
@@ -18,7 +17,7 @@ class PSD
             val = @channel_data[i + (@channel_length * index)]
 
             case chan[:id]
-            when -1 then  a = (val * opacity).to_i
+            when -1 then  a = val
             when 0 then   r = val
             when 1 then   g = val
             when 2 then   b = val

data/lib/psd/nodes/build_preview.rb

@@ -22,7 +22,13 @@ class PSD
               compose! c, png, c.build_png, 0, 0
             end
           else
-            compose! c, png, c.image.to_png_with_mask, c.left.to_i, c.top.to_i
+            compose!(
+              c, 
+              png, 
+              c.image.to_png_with_mask, 
+              PSD::Util.clamp(c.left.to_i, 0, png.width), 
+              PSD::Util.clamp(c.top.to_i, 0, png.height)
+            )
           end
         end
 
@@ -37,7 +43,7 @@ class PSD
       end
 
       # Modified from ChunkyPNG::Canvas#compose! in order to support various blend modes.
-      def compose!(layer, base, other, offset_x = 0, offset_y = 0)
+      def compose!(layer, base, other, offset_x, offset_y)
         blending_mode = layer.blending_mode.gsub(/ /, '_')
         PSD.logger.warn("Blend mode #{blending_mode} is not implemented") unless Compose.respond_to?(blending_mode)
         PSD.logger.debug("Blending #{layer.name} with #{blending_mode} blend mode")
@@ -45,6 +51,10 @@ class PSD
         LayerStyles.new(layer, other).apply!
         other = ClippingMask.new(layer, other).apply
 
+        blend_pixels!(blending_mode, layer, base, other, offset_x, offset_y)
+      end
+
+      def blend_pixels!(blending_mode, layer, base, other, offset_x, offset_y)
         other.height.times do |y|
           other.width.times do |x|
             base_x = x + offset_x

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

metadata

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