psd 2.1.2 → 3.9.0

data/lib/psd/image_formats/rle.rb

@@ -35,24 +35,18 @@ class PSD
           finish = @file.tell + byte_count
 
           while @file.tell < finish
-            len = @file.read(1).bytes.to_a[0]
+            len = @file.read_byte
 
             if len < 128
               len += 1
-              (@chan_pos...@chan_pos+len).each do |k|
-                @channel_data[k] = @file.read(1).bytes.to_a[0]
-              end
-
+              @channel_data.insert @chan_pos, *@file.read(len).bytes.to_a
               @chan_pos += len
             elsif len > 128
               len ^= 0xff
               len += 2
 
-              val = @file.read(1).bytes.to_a[0]
-              (@chan_pos...@chan_pos+len).each do |k|
-                @channel_data[k] = val
-              end
-
+              val = @file.read(1).bytes.to_a
+              @channel_data.insert @chan_pos, *(val * len) 
               @chan_pos += len
             end
           end

data/lib/psd/image_modes/cmyk.rb

@@ -3,17 +3,30 @@ class PSD
     module CMYK
       private
 
+      def set_cmyk_channels
+        @channels_info = [
+          { id: 0 },
+          { id: 1 },
+          { id: 2 },
+          { id: 3 }
+        ]
+
+        @channels_info << {id: -1} if channels == 5
+      end
+
       def combine_cmyk_channel
+        cmyk_channels = @channels_info.
+          map    { |ch| ch[:id] }.
+          reject { |ch| ch < -1 }
+
         (0...@num_pixels).step(pixel_step) do |i|
           c = m = y = k = 0
           a = 255
 
-          @channels_info.each_with_index do |chan, index|
-            next if chan[:id] == -2
-
+          cmyk_channels.each_with_index do |chan, index|
             val = @channel_data[i + (@channel_length * index)]
 
-            case chan[:id]
+            case chan
             when -1 then a = val
             when 0 then c = val
             when 1 then m = val
@@ -28,4 +41,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/image_modes/greyscale.rb

@@ -3,6 +3,11 @@ class PSD
     module Greyscale
       private
 
+      def set_greyscale_channels
+        @channels_info = [{ id: 0 }]
+        @channels_info << { id: -1 } if channels == 2
+      end
+
       def combine_greyscale_channel
         if channels == 2
           (0...@num_pixels).step(pixel_step) do |i|
@@ -19,4 +24,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/image_modes/rgb.rb

@@ -4,19 +4,31 @@ class PSD
     module RGB
       private
 
+      def set_rgb_channels
+        @channels_info = [
+          { id: 0 },
+          { id: 1 },
+          { id: 2 }
+        ]
+
+        @channels_info << {id: -1} if channels == 4
+      end
+
       def combine_rgb_channel
         PSD.logger.debug "Beginning RGB processing"
 
+        rgb_channels = @channels_info.
+          map    { |ch| ch[:id] }.
+          reject { |ch| ch < -1 }
+
         (0...@num_pixels).step(pixel_step) do |i|
           r = g = b = 0
           a = 255
 
-          @channels_info.each_with_index do |chan, index|
-            next if chan[:id] == -2
-            
+          rgb_channels.each_with_index do |chan, index|
             val = @channel_data[i + (@channel_length * index)]
 
-            case chan[:id]
+            case chan
             when -1 then  a = val
             when 0 then   r = val
             when 1 then   g = val
@@ -29,4 +41,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/layer/blend_modes.rb

@@ -1,30 +1,32 @@
 class PSD
   class Layer
     module BlendModes
-      attr_reader :blend_mode, :opacity
+      extend Forwardable
+      
+      attr_reader :blend_mode
+
+      def_delegators :blend_mode, :opacity, :visible, :clipped?
+      alias_method :visible?, :visible
+
+      # Is this layer hidden?
+      def hidden?
+        !visible
+      end
 
       def blending_mode
         if !info[:section_divider].nil? && info[:section_divider].blend_mode
           BlendMode::BLEND_MODES[info[:section_divider].blend_mode.strip.to_sym]
         else
-          @blending_mode
+          @blend_mode.mode
         end
       end
 
-      # Is the layer below this one a clipping mask?
-      def clipped?
-        @blend_mode.clipping == 1
-      end
-
       private
       
       def parse_blend_modes
-        @blend_mode = BlendMode.read(@file)
-
-        @blending_mode = @blend_mode.mode
-        @opacity = @blend_mode.opacity
-        @visible = @blend_mode.visible
+        @blend_mode = BlendMode.new(@file)
+        @blend_mode.parse!
       end
     end
   end
-end
+end

data/lib/psd/layer/helpers.rb

@@ -47,16 +47,6 @@ class PSD
         info[:locked].transparency_locked
       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]
@@ -72,6 +62,14 @@ class PSD
         return 255 unless info.has_key?(:fill_opacity)
         info[:fill_opacity].value
       end
+
+      def raster_mask?
+        image.has_mask? && image.mask_data.length > 0
+      end
+
+      def vector_mask?
+        !vector_mask.nil?
+      end
     end
   end
 end

data/lib/psd/layer/info/black_white.rb

@@ -0,0 +1,33 @@
+require 'psd/layer_info'
+
+class PSD
+  class BlackWhite < LayerInfo
+    def self.should_parse?(key)
+      key == 'blwh'
+    end
+
+    attr_reader :red, :yellow, :green, :cyan, :blue, :magenta
+    attr_reader :tint, :tint_color, :preset_id, :preset_name
+
+    def parse
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+
+      @red = @data['Rd  ']
+      @yellow = @data['Yllw']
+      @green = @data['Grn ']
+      @cyan = @data['Cyn ']
+      @blue = @data['Bl  ']
+      @magenta = @data['Mgnt']
+      @tint = @data['useTint']
+      @tint_color = {
+        red: @data['tintColor']['Rd  '],
+        green: @data['tintColor']['Grn '],
+        blue: @data['tintColor']['Bl  ']
+      }
+
+      @preset_id = @data['bwPresetKind']
+      @preset_name = @data['blackAndWhitePresetFileName']
+    end
+  end
+end

data/lib/psd/{layer_info → layer/info}/blend_clipping_elements.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class BlendClippingElements < LayerInfo
-    @key = 'clbl'
+    def self.should_parse?(key)
+      key == 'clbl'
+    end
 
     attr_reader :enabled
     def parse

data/lib/psd/{layer_info → layer/info}/blend_interior_elements.rb

@@ -1,8 +1,10 @@
-require_relative '../layer_info'
+require 'psd/layer_info'
 
 class PSD
   class BlendInteriorElements < LayerInfo
-    @key = 'infx'
+    def self.should_parse?(key)
+      key == 'infx'
+    end
 
     attr_reader :enabled
     def parse

data/lib/psd/layer/info/brightness_contrast.rb

@@ -0,0 +1,21 @@
+require 'psd/layer_info'
+
+class PSD
+  # NOTE: this only has the correct values when the "Use Legacy"
+  # checkbox is checked. If the 'CgEd' info key is present, these
+  # values will all be 0. Use that info block instead.
+  class BrightnessContrast < LayerInfo
+    def self.should_parse?(key)
+      key == 'brit'
+    end
+
+    attr_reader :brightness, :contrast, :mean_value, :lab_color
+
+    def parse
+      @brightness = @file.read_short
+      @contrast = @file.read_short
+      @mean_value = @file.read_short
+      @lab_color = @file.read_boolean
+    end
+  end
+end

data/lib/psd/layer/info/channel_blending_restrictions.rb

@@ -0,0 +1,27 @@
+require 'psd/layer_info'
+
+class PSD
+  class ChannelBlendingRestrictions < LayerInfo
+    def self.should_parse?(key)
+      key == 'brst'
+    end
+
+    MODES = {
+      'RGBColor' => ['R', 'G', 'B'],
+      'CMYKColor' => ['C', 'M', 'Y', 'K']
+    }
+
+    attr_reader :restricted_channels, :restricted_channels_by_letter
+
+    def parse
+      @restricted_channels = []
+      @restricted_channels_by_letter = []
+
+      (@length / 4).times do
+        channel = @file.read_int
+        @restricted_channels << channel
+        @restricted_channels_by_letter << MODES[@layer.header.mode_name][channel]
+      end
+    end
+  end
+end

data/lib/psd/layer/info/channel_mixer.rb

@@ -0,0 +1,27 @@
+require 'psd/layer_info'
+
+class PSD
+  class ChannelMixer < LayerInfo
+    def self.should_parse?(key)
+      key == 'mixr'
+    end
+
+    attr_reader :monochrome, :color
+
+    def parse
+      @file.seek 2, IO::SEEK_CUR
+
+      @monochrome = @file.read_short > 0
+
+      @color = 4.times.map do
+        {
+          red_cyan: @file.read_short,
+          green_magenta: @file.read_short,
+          blue_yellow: @file.read_short,
+          black: @file.read_short,
+          constant: @file.read_short
+        }
+      end
+    end
+  end
+end

data/lib/psd/layer/info/color_balance.rb

@@ -0,0 +1,23 @@
+require 'psd/layer_info'
+
+class PSD
+  class ColorBalance < LayerInfo
+    def self.should_parse?(key)
+      key == 'blnc'
+    end
+
+    attr_reader :shadows, :midtones, :highlights, :preserve_luminosity
+
+    def parse
+      @shadows, @midtones, @highlights = 3.times.map do
+        {
+          cyan_red: @file.read_short,
+          magenta_green: @file.read_short,
+          yellow_blue: @file.read_short
+        }
+      end
+
+      @preserve_luminosity = @file.read_short > 0
+    end
+  end
+end

data/lib/psd/layer/info/color_lookup.rb

@@ -0,0 +1,14 @@
+require 'psd/layer_info'
+
+class PSD
+  class ColorLookup < LayerInfo
+    def self.should_parse?(key)
+      key == 'clrL'
+    end
+
+    def parse
+      @file.seek 6, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+  end
+end

data/lib/psd/layer/info/content_generator.rb

@@ -0,0 +1,42 @@
+require 'psd/layer_info'
+
+class PSD
+  # This is the new way that Photoshop stores the brightness/contrast
+  # data. If this data is present, DO NOT use the legacy BrightnessContrast
+  # info block.
+  class ContentGenerator < LayerInfo
+    def self.should_parse?(key)
+      key == 'CgEd'
+    end
+
+    def parse
+      # Version
+      @file.seek 4, IO::SEEK_CUR
+      @data = Descriptor.new(@file).parse
+    end
+
+    def brightness
+      @data['Brgh']
+    end
+
+    def contrast
+      @data['Cntr']
+    end
+
+    def mean_value
+      @data['means']
+    end
+
+    def lab_color
+      @data['Lab ']
+    end
+
+    def use_legacy
+      @data['useLegacy']
+    end
+
+    def auto
+      @data['Auto']
+    end
+  end
+end

data/lib/psd/layer/info/curves.rb

@@ -0,0 +1,78 @@
+require 'psd/layer_info'
+
+class PSD
+  class Curves < LayerInfo
+    def self.should_parse?(key)
+      key == 'curv'
+    end
+
+    attr_reader :curves
+
+    def parse
+      # Padding, spec is wrong. Maybe Photoshop bug?
+      @file.seek 1, IO::SEEK_CUR
+
+      # Version
+      @file.seek 2, IO::SEEK_CUR
+
+      tag = @file.read_int
+      curve_count = 0
+
+      # Legacy data, it looks like there are 32 positions
+      # where you can adjust the curve, and there is a chunk
+      # of 32 bytes that determine whether that chunk is set.
+      32.times do |i|
+        curve_count += 1 if tag & (1 << i) > 0
+      end
+
+      @curves = []
+      curve_count.times do |i|
+        # Before each curve is a channel index
+        count = 0
+        curve = {}
+        32.times do |j|
+          if tag & (1 << j) > 0
+            if count == i
+              curve[:channel_index] = j
+              break
+            end
+
+            count += 1
+          end
+        end
+
+        point_count = @file.read_short
+        curve[:points] = point_count.times.map do
+          {
+            output_value: @file.read_short,
+            input_value: @file.read_short
+          }
+        end
+
+        @curves << curve
+      end
+
+      if @file.tell < @section_end - 4
+        tag = @file.read_string(4)
+        raise "Extra curves key error: #{tag}" if tag != 'Crv '
+
+        @file.seek 2, IO::SEEK_CUR
+
+        curve_count = @file.read_int
+        curve_count.times do
+          curve = { channel_index: @file.read_short }
+
+          point_count = @file.read_short
+          curve[:points] = point_count.times.map do
+            {
+              output_value: @file.read_short,
+              input_value: @file.read_short
+            }
+          end
+
+          @curves << curve
+        end
+      end
+    end
+  end
+end

data/lib/psd/layer/info/effects_layer.rb

@@ -0,0 +1,174 @@
+require 'psd/layer_info'
+
+class PSD
+  # The file specification is majorly fucked for this info block. Had to make
+  # lots of tweaks.
+  class EffectsLayer < LayerInfo
+    def self.should_parse?(key)
+      key == 'lrFX'
+    end
+
+    BEVEL_STYLES = [
+      'Outer Bevel',
+      'Inner Bevel',
+      'Emboss',
+      'Pillow Emboss',
+      'Stroke Emboss'
+    ].freeze
+
+    def parse
+      version = @file.read_short
+      effects_count = @file.read_short
+
+      @data = {}
+      effects_count.times do
+        sig = @file.read_string(4)
+        if sig != "8BIM"
+          PSD.logger.debug "Effect layer signature was not 8BIM, got #{sig}. Skipping."
+          return false
+        end
+
+        key = @file.read_string(4)
+        case key
+        when 'cmnS' then common_state
+        when 'dsdw' then shadow(:drop_shadow)
+        when 'isdw' then shadow(:inner_shadow)
+        when 'oglw' then outer_glow
+        when 'iglw' then inner_glow
+        when 'bevl' then bevel
+        when 'sofi' then solid_fill
+        end
+      end
+    end
+
+    private
+
+    # This is the most pointless block of data yet.
+    def common_state
+      @file.seek 11, IO::SEEK_CUR
+      @data[:visible] = true
+    end
+
+    def shadow(key)
+      @data[key] = {}
+      size = @file.read_int
+
+      @data[key][:version] = @file.read_int
+      @data[key][:size] = @file.read_short
+      @data[key][:spread] = @file.read_int
+      @data[key][:angle] = @file.read_int
+      @data[key][:distance] = @file.read_int
+
+      # Not sure if Photoshop or the spec is wrong, but somebody done goofed.
+      @file.seek 2, IO::SEEK_CUR
+
+      @data[key][:color] = @file.read_space_color
+
+      @file.seek 4, IO::SEEK_CUR # blend mode sig
+      @data[key][:blend_mode] = @file.read_string(4)
+      @data[key][:enabled] = @file.read_boolean
+      @data[key][:use_global_light] = @file.read_boolean
+      @data[key][:opacity] = (255.0 / @file.read_byte).round
+
+      if size == 51
+        @data[key][:native_color] = @file.read_space_color
+      end
+    end
+
+    def outer_glow
+      @data[:outer_glow] = {}
+      size = @file.read_int
+
+      @data[:outer_glow][:version] = @file.read_int
+      @data[:outer_glow][:size] = @file.read_short
+      @data[:outer_glow][:spread] = @file.read_int
+      @file.seek 2, IO::SEEK_CUR
+
+      @data[:outer_glow][:color] = @file.read_space_color
+
+      @file.seek 4, IO::SEEK_CUR # blend sig
+      @data[:outer_glow][:blend_mode] = @file.read_string(4)
+      @data[:outer_glow][:enabled] = @file.read_boolean
+      @data[:outer_glow][:opacity] = (255.0 / @file.read_byte).round
+
+      if size ==42
+        @data[:outer_glow][:native_color] = @file.read_space_color
+      end
+    end
+
+    def inner_glow
+      @data[:inner_glow] = {}
+      size = @file.read_int
+
+      @data[:inner_glow][:version] = @file.read_int
+      @data[:inner_glow][:size] = @file.read_short
+      @data[:inner_glow][:spread] = @file.read_int
+      @file.seek 2, IO::SEEK_CUR
+
+      @data[:inner_glow][:color] = @file.read_space_color
+
+      @file.seek 4, IO::SEEK_CUR # blend sig
+      @data[:inner_glow][:blend_mode] = @file.read_string(4)
+      @data[:inner_glow][:enabled] = @file.read_boolean
+      @data[:inner_glow][:opacity] = (255.0 / @file.read_byte).round
+
+      if @data[:inner_glow][:version] == 2
+        @data[:inner_glow][:invert] = @file.read_boolean
+        @data[:inner_glow][:native_color] = @file.read_space_color
+      end
+    end
+
+    def bevel
+      @data[:bevel] = {}
+      size = @file.read_int
+
+      @data[:bevel][:version] = @file.read_int
+
+      # Okay somebody really goofed, this is super weird.
+      @data[:bevel][:angle] = @file.read_short
+      @file.seek 2, IO::SEEK_CUR
+      @data[:bevel][:size] = @file.read_short
+      @file.seek 2, IO::SEEK_CUR
+      @data[:bevel][:soften] = @file.read_short
+      @file.seek 2, IO::SEEK_CUR
+
+      @file.seek 4, IO::SEEK_CUR
+      @data[:bevel][:highlight_blend] = @file.read_string(4)
+
+      @file.seek 4, IO::SEEK_CUR
+      @data[:bevel][:shadow_blend] = @file.read_string(4)
+
+      @data[:bevel][:highlight_color] = @file.read_space_color
+      @data[:bevel][:shadow_color] = @file.read_space_color
+
+      @data[:bevel][:style_id] = @file.read_byte
+      @data[:bevel][:style] = BEVEL_STYLES[@data[:bevel][:style_id]]
+
+      @data[:bevel][:highlight_opacity] = @file.read_byte
+      @data[:bevel][:shadow_opacity] = @file.read_byte
+      @data[:bevel][:enabled] = @file.read_boolean
+      @data[:bevel][:use_global_light] = @file.read_boolean
+      @data[:bevel][:direction] = @file.read_byte == 0 ? 'Up' : 'Down'
+
+      if @data[:bevel][:version] == 2
+        @data[:bevel][:real_highlight_color] = @file.read_space_color
+        @data[:bevel][:real_shadow_color] = @file.read_space_color
+      end
+    end
+
+    def solid_fill
+      @data[:solid_fill] = {}
+      @file.seek 4, IO::SEEK_CUR
+
+      @data[:solid_fill][:version] = @file.read_int
+
+      @file.seek 4, IO::SEEK_CUR
+      @data[:solid_fill][:blend_mode] = @file.read_string(4)
+
+      @data[:solid_fill][:color] = @file.read_space_color
+      @data[:solid_fill][:opacity] = (255.0 / @file.read_byte).round
+      @data[:solid_fill][:enabled] = @file.read_boolean
+      @data[:solid_fill][:native_color] = @file.read_space_color
+    end
+  end
+end