psd 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07d04a8de80525605f55cc1346b195d159448da4
-  data.tar.gz: 0eb80cec71da604ffa67e727ad90377b881dd028
+  metadata.gz: 448518141d3b745904f809280d0e826e08bf8dc0
+  data.tar.gz: 4c0725157152e2f924b95cf023603a9b86bd1f54
 SHA512:
-  metadata.gz: 5dab1760c194b6abffe95ee77d061987dfb1d0cf8e7c59375d2f78726c912d36ef786fd5e240d7305d8edefe2f2650fea1546bdfc55b41ce2620d142383ed251
-  data.tar.gz: e04a6725116b6be409215c47fb1d208c7aaacdb4959d84cbc9390d43cd9f2f96378858ac31880be427a02ada478320523a7cec37923bdc7b914d15f7e9d47197
+  metadata.gz: e559032f4b160eb26451c38aa4bc3fa7869aa6984f60c5d062596087cf32a38fdc181e3c703a56b22ba88fc965abe727fa158eb427f76042e46c55f694593ab3
+  data.tar.gz: 4e31eb123c902d3381e3895d262589f8d269aca4e30c8a74f541d03ef6a9e527aefc9c895df5e358f62e5e8f5b584e4a6a5070b4cf83a10892c629ba46550d96

data/lib/psd.rb

@@ -9,7 +9,8 @@ dir_root = File.dirname(File.absolute_path(__FILE__)) + '/psd'
   '/image_modes/*',
   '/image_exports/*',
   '/nodes/*',
-  '/layer_info/**/*',
+  '/layer_info/*',
+  '/layer/*',
   '/**/*'
 ].each do |path|
   Dir.glob(dir_root + path) { |file| require file if File.file?(file) }

data/lib/psd/layer.rb

@@ -3,38 +3,24 @@ class PSD
   # that layer.
   class Layer
     include Section
-
-    attr_reader :id, :mask, :blending_ranges, :adjustments, :channels_info
-    attr_reader :blend_mode, :layer_type, :blending_mode, :opacity, :fill_opacity
-    attr_reader :channels, :image
-
-    attr_accessor :group_layer
-    attr_accessor :top, :left, :bottom, :right, :rows, :cols, :ref_x, :ref_y, :node, :file
-
-    alias :info :adjustments
-    alias :width :cols
-    alias :height :rows
-
-    # All of the extra layer info sections that we know how to parse.
-    LAYER_INFO = {
-      type: TypeTool,
-      legacy_type: LegacyTypeTool,
-      metadata: MetadataSetting,
-      layer_name_source: LayerNameSource,
-      object_effects: ObjectEffects,
-      name: UnicodeName,
-      section_divider: LayerSectionDivider,
-      reference_point: ReferencePoint,
-      layer_id: LayerID,
-      fill_opacity: FillOpacity,
-      placed_layer: PlacedLayer,
-      vector_mask: VectorMask
-    }
+    include BlendModes
+    include BlendingRanges
+    include ChannelImage
+    include Exporting
+    include Helpers
+    include Info
+    include Mask
+    include Name
+    include PathComponents
+    include PositionAndChannels
+
+    attr_reader :id, :info_keys
+    attr_accessor :group_layer, :node, :file
 
     # Initializes all of the defaults for the layer.
     def initialize(file)
       @file = file
-      @image = nil
+
       @mask = {}
       @blending_ranges = {}
       @adjustments = {}
@@ -42,10 +28,8 @@ class PSD
       @blend_mode = {}
       @group_layer = nil
 
-      @layer_type = 'normal'
       @blending_mode = 'normal'
       @opacity = 255
-      @fill_opacity = 255
 
       # Just used for tracking which layer adjustments we're parsing.
       # Not essential.
@@ -56,9 +40,9 @@ class PSD
     def parse(index=nil)
       start_section
 
-      @idx = index
+      @id = index
 
-      parse_info
+      parse_position_and_channels
       parse_blend_modes
 
       extra_len = @file.read_int
@@ -67,7 +51,7 @@ class PSD
       parse_mask_data
       parse_blending_ranges
       parse_legacy_layer_name
-      parse_extra_data
+      parse_layer_info
 
       PSD.logger.debug "Layer name = #{name}"
 
@@ -77,278 +61,16 @@ class PSD
       return self
     end
 
-    # Export the layer to file. May or may not work.
-    def export(outfile)
-      export_info(outfile)
-
-      @blend_mode.write(outfile)
-      @file.seek(@blend_mode.num_bytes, IO::SEEK_CUR)
-
-      export_mask_data(outfile)
-      export_blending_ranges(outfile)
-      export_legacy_layer_name(outfile)
-      export_extra_data(outfile)
-
-      outfile.write @file.read(end_of_section - @file.tell)
-    end
-
     # We just delegate this to a normal method call.
     def [](val)
       self.send(val)
     end
 
-    def parse_channel_image!(header, parse)
-      @image = ChannelImage.new(@file, header, self)
-      parse ? @image.parse : @image.skip
-    end
-
-    # Does this layer represent the start of a folder section?
-    def folder?
-      return false unless @adjustments.has_key?(:section_divider)
-      @adjustments[:section_divider].is_folder
-    end
-
-    # Does this layer represent the end of a folder section?
-    def folder_end?
-      return false unless @adjustments.has_key?(:section_divider)
-      @adjustments[:section_divider].is_hidden
-    end
-
-    # Is this layer visible?
-    def visible?
-      @visible
-    end
-
-    # Is this layer hidden?
-    def hidden?
-      !@visible
-    end
-
-    # Attempt to translate this layer and modify the document.
-    def translate(x=0, y=0)
-      @left += x
-      @right += x
-      @top += y
-      @bottom += y
-
-      @path_components.each{ |p| p.translate(x,y) } if @path_components
-    end
-
-    # Attempt to scale the path components within this layer.
-    def scale_path_components(xr, yr)
-      return unless @path_components
-
-      @path_components.each{ |p| p.scale(xr, yr) }
-    end
-
-    # Helper that exports the text data in this layer, if any.
-    def text
-      return nil unless @adjustments[:type]
-      @adjustments[:type].to_hash
-    end
-
-    # Gets the name of this layer. If the PSD file is from an even remotely
-    # recent version of Photoshop, this data is stored as extra layer info and
-    # as a UTF-16 name. Otherwise, it's stored in a legacy block.
-    def name
-      if @adjustments.has_key?(:name)
-        return @adjustments[:name].data
-      end
-
-      return @legacy_name
-    end
-
     # We delegate all missing method calls to the extra layer info to make it easier
     # to access that data.
     def method_missing(method, *args, &block)
       return @adjustments[method] if @adjustments.has_key?(method)
       super
     end
-
-    private
-
-    def parse_info
-      start_section(:info)
-
-      @top = @file.read_int
-      @left = @file.read_int
-      @bottom = @file.read_int
-      @right = @file.read_int
-      @channels = @file.read_short
-
-      @rows = @bottom - @top
-      @cols = @right - @left
-
-      @channels.times do
-        channel_id = @file.read_short
-        channel_length = @file.read_int
-
-        @channels_info << {id: channel_id, length: channel_length}
-      end
-
-      end_section(:info)
-    end
-
-    def export_info(outfile)
-      [@top, @left, @bottom, @right].each { |val| outfile.write_int(val) }
-      outfile.write_short(@channels)
-
-      @channels_info.each do |channel_info|
-        outfile.write_short channel_info[:id]
-        outfile.write_int channel_info[:length]
-      end
-
-      @file.seek end_of_section(:info)
-    end
-
-    def export_mask_data(outfile)
-      outfile.write @file.read(@mask_end - @mask_begin + 4)
-    end
-
-    def export_blending_ranges(outfile)
-      length = 4 * 2 # greys
-      length += @blending_ranges[:num_channels] * 8
-      outfile.write_int length
-
-      outfile.write_short @blending_ranges[:grey][:source][:black]
-      outfile.write_short @blending_ranges[:grey][:source][:white]
-      outfile.write_short @blending_ranges[:grey][:dest][:black]
-      outfile.write_short @blending_ranges[:grey][:dest][:white]
-
-      @blending_ranges[:num_channels].times do |i|
-        outfile.write_short @blending_ranges[:channels][i][:source][:black]
-        outfile.write_short @blending_ranges[:channels][i][:source][:white]
-        outfile.write_short @blending_ranges[:channels][i][:dest][:black]
-        outfile.write_short @blending_ranges[:channels][i][:dest][:white]
-      end
-
-      @file.seek length + 4, IO::SEEK_CUR
-    end
-
-    def export_legacy_layer_name(outfile)
-      outfile.write @file.read(@legacy_name_end - @legacy_name_start)
-    end
-
-    def export_extra_data(outfile)
-      outfile.write @file.read(@extra_data_end - @extra_data_begin)
-      if @path_components && !@path_components.empty?
-        outfile.seek @vector_mask_begin
-        @file.seek @vector_mask_begin
-
-        write_vector_mask(outfile)
-        @file.seek outfile.tell
-      end
-    end
-
-    def parse_blend_modes
-      @blend_mode = BlendMode.read(@file)
-
-      @blending_mode = @blend_mode.mode
-      @opacity = @blend_mode.opacity
-      @visible = @blend_mode.visible
-    end
-
-    def parse_mask_data
-      @mask_begin = @file.tell
-      @mask = Mask.read(@file)
-      @mask_end = @file.tell
-    end
-
-    def parse_blending_ranges
-      length = @file.read_int
-
-      @blending_ranges[:grey] = {
-        source: {
-          black: @file.read_short,
-          white: @file.read_short
-        },
-        dest: {
-          black: @file.read_short,
-          white: @file.read_short
-        }
-      }
-
-      @blending_ranges[:num_channels] = (length - 8) / 8
-
-      @blending_ranges[:channels] = []
-      @blending_ranges[:num_channels].times do
-        @blending_ranges[:channels] << {
-          source: {
-            black: @file.read_short,
-            white: @file.read_short
-          },
-          dest: {
-            black: @file.read_short,
-            white: @file.read_short
-          }
-        }
-      end
-    end
-
-    # The old school layer names are encoded in MacRoman format,
-    # not UTF-8. Luckily Ruby kicks ass at character conversion.
-    def parse_legacy_layer_name
-      @legacy_name_start = @file.tell
-
-      len = Util.pad4 @file.read(1).bytes.to_a[0]
-      @legacy_name = @file.read_string(len)
-
-      @legacy_name_end = @file.tell
-    end
-
-    # This section is a bit tricky to parse because it represents all of the
-    # extra data that describes this layer.
-    def parse_extra_data
-      @extra_data_begin = @file.tell
-
-      while @file.tell < @layer_end
-        # Signature, don't need
-        @file.seek 4, IO::SEEK_CUR
-
-        # Key, very important
-        key = @file.read_string(4)
-        @info_keys << key
-
-        length = Util.pad2 @file.read_int
-        pos = @file.tell
-
-        info_parsed = false
-        LAYER_INFO.each do |name, info|
-          next unless info.key == key
-
-          PSD.logger.debug "Layer Info: key = #{key}, start = #{pos}, length = #{length}"
-
-          begin
-            i = info.new(@file, length)
-            i.parse
-
-            @adjustments[name] = i
-            info_parsed = true
-          rescue Exception => e
-            PSD.logger.error "Parsing error: key = #{key}, message = #{e.message}"
-            PSD.logger.error e.backtrace.join("\n")
-          end
-
-          break
-        end
-
-        if !info_parsed
-          PSD.logger.debug "Skipping: key = #{key}, pos = #{@file.tell}, length = #{length}"
-          @file.seek pos + length
-        end
-
-        @file.seek pos + length if @file.tell != (pos + length)
-      end
-
-      @extra_data_end = @file.tell
-    end
-
-    def write_vector_mask(outfile)
-      outfile.write @file.read(8)
-      # outfile.write_int 3
-      # outfile.write_int @vector_tag
-
-      @path_components.each{ |pc| pc.write(outfile); @file.seek(26, IO::SEEK_CUR) }
-    end
   end
 end

data/lib/psd/layer/blend_modes.rb

@@ -0,0 +1,17 @@
+class PSD
+  class Layer
+    module BlendModes
+      attr_reader :blend_mode, :blending_mode, :opacity
+
+      private
+      
+      def parse_blend_modes
+        @blend_mode = BlendMode.read(@file)
+
+        @blending_mode = @blend_mode.mode
+        @opacity = @blend_mode.opacity
+        @visible = @blend_mode.visible
+      end
+    end
+  end
+end

data/lib/psd/layer/blending_ranges.rb

@@ -0,0 +1,60 @@
+class PSD
+  class Layer
+    module BlendingRanges
+      attr_reader :blending_ranges
+
+      private
+      
+      def parse_blending_ranges
+        length = @file.read_int
+
+        @blending_ranges[:grey] = {
+          source: {
+            black: @file.read_short,
+            white: @file.read_short
+          },
+          dest: {
+            black: @file.read_short,
+            white: @file.read_short
+          }
+        }
+
+        @blending_ranges[:num_channels] = (length - 8) / 8
+
+        @blending_ranges[:channels] = []
+        @blending_ranges[:num_channels].times do
+          @blending_ranges[:channels] << {
+            source: {
+              black: @file.read_short,
+              white: @file.read_short
+            },
+            dest: {
+              black: @file.read_short,
+              white: @file.read_short
+            }
+          }
+        end
+      end
+
+      def export_blending_ranges(outfile)
+        length = 4 * 2 # greys
+        length += @blending_ranges[:num_channels] * 8
+        outfile.write_int length
+
+        outfile.write_short @blending_ranges[:grey][:source][:black]
+        outfile.write_short @blending_ranges[:grey][:source][:white]
+        outfile.write_short @blending_ranges[:grey][:dest][:black]
+        outfile.write_short @blending_ranges[:grey][:dest][:white]
+
+        @blending_ranges[:num_channels].times do |i|
+          outfile.write_short @blending_ranges[:channels][i][:source][:black]
+          outfile.write_short @blending_ranges[:channels][i][:source][:white]
+          outfile.write_short @blending_ranges[:channels][i][:dest][:black]
+          outfile.write_short @blending_ranges[:channels][i][:dest][:white]
+        end
+
+        @file.seek length + 4, IO::SEEK_CUR
+      end
+    end
+  end
+end

data/lib/psd/layer/channel_image.rb

@@ -0,0 +1,12 @@
+class PSD
+  class Layer
+    module ChannelImage
+      attr_reader :image
+
+      def parse_channel_image(header, parse)
+        @image = PSD::ChannelImage.new(@file, header, self)
+        parse ? @image.parse : @image.skip
+      end
+    end
+  end
+end

data/lib/psd/layer/exporting.rb

@@ -0,0 +1,28 @@
+class PSD
+  class Layer
+    module Exporting
+      # Export the layer to file. May or may not work.
+      def export(outfile)
+        export_position_and_channels(outfile)
+
+        @blend_mode.write(outfile)
+        @file.seek(@blend_mode.num_bytes, IO::SEEK_CUR)
+
+        export_mask_data(outfile)
+        export_blending_ranges(outfile)
+        export_legacy_layer_name(outfile)
+        export_extra_data(outfile)
+
+        outfile.write @file.read(end_of_section - @file.tell)
+      end
+
+      def write_vector_mask(outfile)
+        outfile.write @file.read(8)
+        # outfile.write_int 3
+        # outfile.write_int @vector_tag
+
+        @path_components.each{ |pc| pc.write(outfile); @file.seek(26, IO::SEEK_CUR) }
+      end
+    end
+  end
+end

data/lib/psd/layer/helpers.rb

@@ -0,0 +1,53 @@
+class PSD
+  class Layer
+    module Helpers
+      # Does this layer represent the start of a folder section?
+      def folder?
+        if info.has_key?(:section_divider)
+          info[:section_divider].is_folder
+        elsif info.has_key?(:nested_section_divider)
+          info[:nested_section_divider].is_folder
+        else
+          name == "<Layer group>"
+        end
+      end
+
+      # Does this layer represent the end of a folder section?
+      def folder_end?
+        if info.has_key?(:section_divider)
+          info[:section_divider].is_hidden
+        elsif info.has_key?(:nested_section_divider)
+          info[:nested_section_divider].is_hidden
+        else
+          name == "</Layer group>"
+        end
+      end
+
+      # Is this layer visible?
+      def visible?
+        @visible
+      end
+
+      # Is this layer hidden?
+      def hidden?
+        !@visible
+      end
+
+      # Helper that exports the text data in this layer, if any.
+      def text
+        return nil unless info[:type]
+        info[:type].to_hash
+      end
+
+      def layer_type
+        return 'normal' unless info.has_key?(:section_divider)
+        info[:section_divider].layer_type
+      end
+
+      def fill_opacity
+        return nil unless info.has_key?(:fill_opacity)
+        info[:fill_opacity].enabled
+      end
+    end
+  end
+end

data/lib/psd/layer/info.rb

@@ -0,0 +1,88 @@
+class PSD
+  class Layer
+    module Info
+      # All of the extra layer info sections that we know how to parse.
+      LAYER_INFO = {
+        type: TypeTool,
+        legacy_type: LegacyTypeTool,
+        metadata: MetadataSetting,
+        layer_name_source: LayerNameSource,
+        object_effects: ObjectEffects,
+        name: UnicodeName,
+        section_divider: LayerSectionDivider,
+        nested_section_divider: NestedLayerDivider,
+        reference_point: ReferencePoint,
+        layer_id: LayerID,
+        fill_opacity: FillOpacity,
+        placed_layer: PlacedLayer,
+        vector_mask: VectorMask
+      }
+
+      attr_reader :adjustments
+      alias :info :adjustments
+
+      private
+
+      # This section is a bit tricky to parse because it represents all of the
+      # extra data that describes this layer.
+      def parse_layer_info
+        @extra_data_begin = @file.tell
+
+        while @file.tell < @layer_end
+          # Signature, don't need
+          @file.seek 4, IO::SEEK_CUR
+
+          # Key, very important
+          key = @file.read_string(4)
+          @info_keys << key
+
+          length = Util.pad2 @file.read_int
+          pos = @file.tell
+
+          info_parsed = false
+          LAYER_INFO.each do |name, info|
+            next unless info.key == key
+
+            PSD.logger.debug "Layer Info: key = #{key}, start = #{pos}, length = #{length}"
+
+            begin
+              i = info.new(@file, length)
+              i.parse
+
+              @adjustments[name] = i
+              info_parsed = true
+            rescue Exception => e
+              PSD.logger.error "Parsing error: key = #{key}, message = #{e.message}"
+              PSD.logger.error e.backtrace.join("\n")
+            end
+
+            break
+          end
+
+          if !info_parsed
+            PSD.logger.debug "Skipping: key = #{key}, pos = #{@file.tell}, length = #{length}"
+            @file.seek pos + length
+          end
+
+          if @file.tell != (pos + length)
+            PSD.logger.warn "Layer info key #{key} ended at #{@file.tell}, expected #{pos + length}"
+            @file.seek pos + length
+          end
+        end
+
+        @extra_data_end = @file.tell
+      end
+
+      def export_extra_data(outfile)
+        outfile.write @file.read(@extra_data_end - @extra_data_begin)
+        if @path_components && !@path_components.empty?
+          outfile.seek @vector_mask_begin
+          @file.seek @vector_mask_begin
+
+          write_vector_mask(outfile)
+          @file.seek outfile.tell
+        end
+      end
+    end
+  end
+end

data/lib/psd/layer/mask.rb

@@ -0,0 +1,19 @@
+class PSD
+  class Layer
+    module Mask
+      attr_reader :mask
+      
+      private
+
+      def parse_mask_data
+        @mask_begin = @file.tell
+        @mask = PSD::Mask.read(@file)
+        @mask_end = @file.tell
+      end
+
+      def export_mask_data(outfile)
+        outfile.write @file.read(@mask_end - @mask_begin + 4)
+      end
+    end
+  end
+end

data/lib/psd/layer/name.rb

@@ -0,0 +1,33 @@
+class PSD
+  class Layer
+    module Name
+      # Gets the name of this layer. If the PSD file is from an even remotely
+      # recent version of Photoshop, this data is stored as extra layer info and
+      # as a UTF-16 name. Otherwise, it's stored in a legacy block.
+      def name
+        if @adjustments.has_key?(:name)
+          return @adjustments[:name].data
+        end
+
+        return @legacy_name
+      end
+
+      private
+
+      # The old school layer names are encoded in MacRoman format,
+      # not UTF-8. Luckily Ruby kicks ass at character conversion.
+      def parse_legacy_layer_name
+        @legacy_name_start = @file.tell
+
+        len = Util.pad4 @file.read(1).bytes.to_a[0]
+        @legacy_name = @file.read_string(len)
+
+        @legacy_name_end = @file.tell
+      end
+
+      def export_legacy_layer_name(outfile)
+        outfile.write @file.read(@legacy_name_end - @legacy_name_start)
+      end
+    end
+  end
+end

data/lib/psd/layer/path_components.rb

@@ -0,0 +1,22 @@
+class PSD
+  class Layer
+    module PathComponents
+      # Attempt to translate this layer and modify the document.
+      def translate(x=0, y=0)
+        @left += x
+        @right += x
+        @top += y
+        @bottom += y
+
+        @path_components.each{ |p| p.translate(x,y) } if @path_components
+      end
+
+      # Attempt to scale the path components within this layer.
+      def scale_path_components(xr, yr)
+        return unless @path_components
+
+        @path_components.each{ |p| p.scale(xr, yr) }
+      end
+    end
+  end
+end

data/lib/psd/layer/position_and_channels.rb

@@ -0,0 +1,47 @@
+class PSD
+  class Layer
+    module PositionAndChannels
+      attr_reader :top, :left, :bottom, :right, :cols, :rows
+      attr_reader :channels, :channels_info
+
+      alias :width :cols
+      alias :height :rows
+
+      private
+
+      def parse_position_and_channels
+        start_section(:info)
+
+        @top = @file.read_int
+        @left = @file.read_int
+        @bottom = @file.read_int
+        @right = @file.read_int
+        @channels = @file.read_short
+
+        @rows = @bottom - @top
+        @cols = @right - @left
+
+        @channels.times do
+          channel_id = @file.read_short
+          channel_length = @file.read_int
+
+          @channels_info << {id: channel_id, length: channel_length}
+        end
+
+        end_section(:info)
+      end
+
+      def export_position_and_channels(outfile)
+        [@top, @left, @bottom, @right].each { |val| outfile.write_int(val) }
+        outfile.write_short(@channels)
+
+        @channels_info.each do |channel_info|
+          outfile.write_short channel_info[:id]
+          outfile.write_int channel_info[:length]
+        end
+
+        @file.seek end_of_section(:info)
+      end
+    end
+  end
+end

data/lib/psd/layer_info/layer_group.rb

@@ -0,0 +1,30 @@
+require_relative '../layer_info'
+
+class PSD
+  # Not 100% sure what the purpose of this key is, but it seems to exist
+  # whenever the lsct key doesn't. Parsing this like a layer section
+  # divider seems to solve a lot of parsing issues with folders.
+  #
+  # See https://github.com/layervault/psd.rb/issues/38
+  class NestedLayerDivider < LayerInfo
+    @key = 'lsdk'
+
+    attr_reader :is_folder, :is_hidden
+
+    def initialize(file, length)
+      super
+
+      @is_folder = false
+      @is_hidden = false
+    end
+
+    def parse
+      code = @file.read_int
+
+      case code
+      when 1, 2 then @is_folder = true
+      when 3 then @is_hidden = true
+      end
+    end
+  end
+end

data/lib/psd/layer_info/layer_section_divider.rb

@@ -4,7 +4,7 @@ class PSD
   class LayerSectionDivider < LayerInfo
     @key = 'lsct'
 
-    attr_reader :layer_type, :is_folder, :is_hidden
+    attr_reader :layer_type, :is_folder, :is_hidden, :blend_mode, :sub_type
 
     SECTION_DIVIDER_TYPES = [
       "other",
@@ -18,6 +18,8 @@ class PSD
 
       @is_folder = false
       @is_hidden = false
+      @blend_mode = nil
+      @sub_type = nil
     end
 
     def parse
@@ -29,6 +31,17 @@ class PSD
       when 3 then @is_hidden = true
       end
 
+      PSD.logger.warn "Section divider is unexpected value: #{code}" if code > 4
+
+      return self unless @length >= 12
+
+      @file.seek 4, IO::SEEK_CUR # sig
+      @blend_mode = @file.read_string(4)
+
+      return self unless @length >= 16
+
+      @sub_type = @file.read_int == 0 ? 'normal' : 'scene group'
+
       return self
     end
   end

data/lib/psd/layer_mask.rb

@@ -56,7 +56,7 @@ class PSD
 
         layers.each do |layer|
           @file.seek 8, IO::SEEK_CUR and next if layer.folder? || layer.folder_end?
-          layer.parse_channel_image!(@header, @options[:parse_layer_images])
+          layer.parse_channel_image(@header, @options[:parse_layer_images])
         end
       end
 

data/lib/psd/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,8 +159,19 @@ files:
 - lib/psd/image_modes/greyscale.rb
 - lib/psd/image_modes/rgb.rb
 - lib/psd/layer.rb
+- lib/psd/layer/blend_modes.rb
+- lib/psd/layer/blending_ranges.rb
+- lib/psd/layer/channel_image.rb
+- lib/psd/layer/exporting.rb
+- lib/psd/layer/helpers.rb
+- lib/psd/layer/info.rb
+- lib/psd/layer/mask.rb
+- lib/psd/layer/name.rb
+- lib/psd/layer/path_components.rb
+- lib/psd/layer/position_and_channels.rb
 - lib/psd/layer_info.rb
 - lib/psd/layer_info/fill_opacity.rb
+- lib/psd/layer_info/layer_group.rb
 - lib/psd/layer_info/layer_id.rb
 - lib/psd/layer_info/layer_name_source.rb
 - lib/psd/layer_info/layer_section_divider.rb