psd 1.3.3 → 1.4.0

data/lib/psd/file.rb

@@ -75,6 +75,10 @@ class PSD
       read(length).encode('UTF-8', 'MacRoman').delete("\000")
     end
 
+    def read_byte
+      read(1).bytes.to_a[0]
+    end
+
     # Reads a unicode string, which is double the length of a normal string and encoded as UTF-16.
     def read_unicode_string(length=nil)
       length ||= read_int if length.nil?
@@ -83,7 +87,7 @@ class PSD
 
     # Reads a boolean value.
     def read_boolean
-      read(1).bytes.to_a[0] != 0
+      read_byte != 0
     end
 
     # Reads a 32-bit color space value.

data/lib/psd/image.rb

@@ -8,6 +8,9 @@ class PSD
     include ImageMode::RGB
     include Export::PNG
 
+    attr_reader :pixel_data, :opacity, :has_mask
+    alias :has_mask? :has_mask
+
     # All of the possible compression formats Photoshop uses.
     COMPRESSIONS = [
       'Raw',
@@ -28,6 +31,8 @@ class PSD
       calculate_length
       @channel_data = []
       @pixel_data = []
+      @opacity = 1.0
+      @has_mask = false
 
       @start_pos = @file.tell
       @end_pos = @start_pos + @length
@@ -110,5 +115,9 @@ class PSD
     def pixel_step
       depth == 8 ? 1 : 2
     end
+
+    def pixel(i)
+      @pixel_data[i]
+    end
   end
 end

data/lib/psd/image_exports/png.rb

@@ -8,7 +8,7 @@ class PSD::Image
       # data.
       def to_png
         PSD.logger.debug "Beginning PNG export"
-        png = ChunkyPNG::Image.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
+        png = ChunkyPNG::Canvas.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
 
         i = 0
         height.times do |y|
@@ -22,6 +22,59 @@ class PSD::Image
       end
       alias :export :to_png
 
+      def to_png_with_mask
+        return to_png unless has_mask?
+
+        PSD.logger.debug "Beginning PNG export with mask"
+        
+        # We generate the preview at the document size instead to make applying the mask
+        # significantly easier.
+        width = @layer.header.width.to_i
+        height = @layer.header.height.to_i
+        png = ChunkyPNG::Canvas.new(width, height, ChunkyPNG::Color::TRANSPARENT)
+
+        i = 0
+        @layer.height.times do |y|
+          @layer.width.times do |x|
+            png[x + @layer.left, y + @layer.top] = @pixel_data[i]
+            i += 1
+          end
+        end
+        
+        # Now we apply the mask
+        i = 0
+        @layer.mask.height.times do |y|
+          @layer.mask.width.times do |x|
+            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))
+            color[3] = color[3] * @mask_data[i] / 255
+
+            png.set_pixel(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)
+      end
+
+      def mask_to_png
+        return unless has_mask?
+
+        png = ChunkyPNG::Canvas.new(@layer.mask.width.to_i, @layer.mask.height.to_i, ChunkyPNG::Color::TRANSPARENT)
+
+        i = 0
+        @layer.mask.height.times do |y|
+          @layer.mask.width.times do |x|
+            png[x, y] = ChunkyPNG::Color.grayscale(@mask_data[i])
+            i += 1
+          end
+        end
+
+        png
+      end
+
       # Saves the PNG data to disk.
       def save_as_png(file)
         to_png.save(file, :fast_rgba)

data/lib/psd/image_formats/raw.rb

@@ -5,7 +5,7 @@ class PSD
       private
 
       def parse_raw!(length = @length)
-        @length.times do |i|
+        length.times do |i|
           @channel_data[i] = @file.read(1).bytes.to_a[0]
         end
       end

data/lib/psd/image_modes/rgb.rb

@@ -10,12 +10,15 @@ 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
+            
             val = @channel_data[i + (@channel_length * index)]
 
             case chan[:id]
-            when -1 then  a = val
+            when -1 then  a = (val * opacity).to_i
             when 0 then   r = val
             when 1 then   g = val
             when 2 then   b = val

data/lib/psd/layer.rb

@@ -14,12 +14,13 @@ class PSD
     include PathComponents
     include PositionAndChannels
 
-    attr_reader :id, :info_keys
+    attr_reader :id, :info_keys, :header
     attr_accessor :group_layer, :node, :file
 
     # Initializes all of the defaults for the layer.
-    def initialize(file)
+    def initialize(file, header)
       @file = file
+      @header = header
 
       @mask = {}
       @blending_ranges = {}

data/lib/psd/layer/blend_modes.rb

@@ -1,7 +1,20 @@
 class PSD
   class Layer
     module BlendModes
-      attr_reader :blend_mode, :blending_mode, :opacity
+      attr_reader :blend_mode, :opacity
+
+      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
+        end
+      end
+
+      # Is the layer below this one a clipping mask?
+      def clipped?
+        @blend_mode.clipping == 1
+      end
 
       private
       

data/lib/psd/layer/blending_ranges.rb

@@ -8,14 +8,16 @@ class PSD
       def parse_blending_ranges
         length = @file.read_int
 
+        # Composite gray blend. Contains 2 black values followed by 2 white values. 
+        # Present but irrelevant for Lab & Grayscale.
         @blending_ranges[:grey] = {
           source: {
-            black: @file.read_short,
-            white: @file.read_short
+            black: [@file.read_byte, @file.read_byte],
+            white: [@file.read_byte, @file.read_byte]
           },
           dest: {
-            black: @file.read_short,
-            white: @file.read_short
+            black: [@file.read_byte, @file.read_byte],
+            white: [@file.read_byte, @file.read_byte]
           }
         }
 
@@ -25,12 +27,12 @@ class PSD
         @blending_ranges[:num_channels].times do
           @blending_ranges[:channels] << {
             source: {
-              black: @file.read_short,
-              white: @file.read_short
+              black: [@file.read_byte, @file.read_byte],
+              white: [@file.read_byte, @file.read_byte]
             },
             dest: {
-              black: @file.read_short,
-              white: @file.read_short
+              black: [@file.read_byte, @file.read_byte],
+              white: [@file.read_byte, @file.read_byte]
             }
           }
         end
@@ -41,16 +43,16 @@ class PSD
         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]
+        outfile.write @blending_ranges[:grey][:source][:black].pack('CC')
+        outfile.write @blending_ranges[:grey][:source][:white].pack('CC')
+        outfile.write @blending_ranges[:grey][:dest][:black].pack('CC')
+        outfile.write @blending_ranges[:grey][:dest][:white].pack('CC')
 
         @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]
+          outfile.write @blending_ranges[:channels][i][:source][:black].pack('CC')
+          outfile.write @blending_ranges[:channels][i][:source][:white].pack('CC')
+          outfile.write @blending_ranges[:channels][i][:dest][:black].pack('CC')
+          outfile.write @blending_ranges[:channels][i][:dest][:white].pack('CC')
         end
 
         @file.seek length + 4, IO::SEEK_CUR

data/lib/psd/layer/helpers.rb

@@ -45,7 +45,7 @@ class PSD
       end
 
       def fill_opacity
-        return nil unless info.has_key?(:fill_opacity)
+        return 255 unless info.has_key?(:fill_opacity)
         info[:fill_opacity].enabled
       end
     end

data/lib/psd/layer/info.rb

@@ -3,6 +3,8 @@ class PSD
     module Info
       # All of the extra layer info sections that we know how to parse.
       LAYER_INFO = {
+        blend_clipping_elements: BlendClippingElements,
+        blend_interior_elements: BlendInteriorElements,
         type: TypeTool,
         legacy_type: LegacyTypeTool,
         metadata: MetadataSetting,
@@ -15,7 +17,10 @@ class PSD
         layer_id: LayerID,
         fill_opacity: FillOpacity,
         placed_layer: PlacedLayer,
-        vector_mask: VectorMask
+        vector_mask: VectorMask,
+        vector_mask_2: VectorMask2,
+        vector_stroke: VectorStroke,
+        vector_stroke_content: VectorStrokeContent
       }
 
       attr_reader :adjustments
@@ -46,7 +51,7 @@ class PSD
             PSD.logger.debug "Layer Info: key = #{key}, start = #{pos}, length = #{length}"
 
             begin
-              i = info.new(@file, length)
+              i = info.new(self, length)
               i.parse
 
               @adjustments[name] = i
@@ -60,7 +65,7 @@ class PSD
           end
 
           if !info_parsed
-            PSD.logger.debug "Skipping: key = #{key}, pos = #{@file.tell}, length = #{length}"
+            PSD.logger.debug "Skipping: layer = #{name}, key = #{key}, pos = #{@file.tell}, length = #{length}"
             @file.seek pos + length
           end
 
@@ -73,6 +78,10 @@ class PSD
         @extra_data_end = @file.tell
       end
 
+      def vector_mask
+        info[:vector_mask_2] || info[:vector_mask]
+      end
+
       def export_extra_data(outfile)
         outfile.write @file.read(@extra_data_end - @extra_data_begin)
         if @path_components && !@path_components.empty?

data/lib/psd/layer_info.rb

@@ -7,8 +7,9 @@ class PSD
     class << self; attr_accessor :key; end
     @key = ""
 
-    def initialize(file, length)
-      @file = file
+    def initialize(layer, length)
+      @layer = layer
+      @file = layer.file
       @length = length
       @section_end = @file.tell + @length
       @data = {}

data/lib/psd/layer_info/blend_clipping_elements.rb

@@ -0,0 +1,13 @@
+require_relative '../layer_info'
+
+class PSD
+  class BlendClippingElements < LayerInfo
+    @key = 'clbl'
+
+    attr_reader :enabled
+    def parse
+      @enabled = @file.read_boolean
+      @file.seek 3, IO::SEEK_CUR
+    end
+  end
+end

data/lib/psd/layer_info/blend_interior_elements.rb

@@ -0,0 +1,13 @@
+require_relative '../layer_info'
+
+class PSD
+  class BlendInteriorElements < LayerInfo
+    @key = 'infx'
+
+    attr_reader :enabled
+    def parse
+      @enabled = @file.read_boolean
+      @file.seek 3, IO::SEEK_CUR
+    end
+  end
+end

data/lib/psd/layer_info/layer_name_source.rb

@@ -4,8 +4,10 @@ class PSD
   class LayerNameSource < LayerInfo
     @key = 'lnsr'
     
+    attr_reader :id
+    
     def parse
-      @data = @file.read_int
+      @id = @file.read_string(4)
       return self
     end
   end

data/lib/psd/layer_info/vector_mask_2.rb

@@ -0,0 +1,10 @@
+require_relative 'vector_mask'
+
+class PSD
+  # Identical to VectorMask, except with a different key. This
+  # exists in Photoshop >= CS6. If this key exists, then there
+  # is also a vscg key.
+  class VectorMask2 < VectorMask
+    @key = 'vsms'
+  end
+end

data/lib/psd/layer_info/vector_stroke.rb

@@ -0,0 +1,12 @@
+require_relative '../layer_info'
+
+class PSD
+  class VectorStroke < LayerInfo
+    @key = 'vstk'
+
+    def parse
+      version = @file.read_int
+      @data = Descriptor.new(@file).parse
+    end
+  end
+end

data/lib/psd/layer_info/vector_stroke_content.rb

@@ -0,0 +1,15 @@
+require_relative '../layer_info'
+
+class PSD
+  class VectorStrokeContent < LayerInfo
+    @key = 'vscg'
+
+    attr_reader :key
+    
+    def parse
+      key = @file.read_string(4)
+      version = @file.read_int
+      @data = Descriptor.new(@file).parse
+    end
+  end
+end

data/lib/psd/layer_mask.rb

@@ -51,7 +51,7 @@ class PSD
 
         @layer_section_start = @file.tell
         layer_count.times do
-          @layers << PSD::Layer.new(@file).parse
+          @layers << PSD::Layer.new(@file, @header).parse
         end
 
         layers.each do |layer|

data/lib/psd/layer_styles.rb

@@ -0,0 +1,84 @@
+class PSD
+  class LayerStyles
+    # Blend modes in layer effects use different keys
+    # than normal layer blend modes. Thanks Adobe.
+    BLEND_TRANSLATION = {
+      'Nrml' => 'norm',
+      'Dslv' => 'diss',
+      'Drkn' => 'dark',
+      'Mltp' => 'mul',
+      'CBrn' => 'idiv',
+      'linearBurn' => 'lbrn',
+      'Lghn' => 'lite',
+      'Scrn' => 'scrn',
+      'CDdg' => 'div',
+      'linearDodge' => 'lddg',
+      'Ovrl' => 'over',
+      'SftL' => 'sLit',
+      'HrdL' => 'hLit',
+      'vividLight' => 'vLit',
+      'linearLight' => 'lLit',
+      'pinLight' => 'pLit',
+      'hardMix' => 'hMix',
+      'Dfrn' => 'diff',
+      'Xclu' => 'smud',
+      'H   ' => 'hue',
+      'Strt' => 'sat',
+      'Clr ' => 'colr',
+      'Lmns' => 'lum'
+    }
+
+    attr_reader :layer, :data, :png
+
+    def initialize(layer, png=nil)
+      @layer = layer
+      @data = layer.info[:object_effects]
+      @png = png || layer.image.to_png
+
+      if @data.nil?
+        @applied = true
+      else
+        @data = @data.data
+        @applied = false
+      end
+    end
+
+    def apply!
+      return png if @applied || data.nil?
+
+      apply_color_overlay if data.has_key?('SoFi')
+      png
+    end
+
+    private
+
+    def apply_color_overlay
+      overlay_data = data['SoFi']
+      color_data = overlay_data['Clr ']
+      blending_mode = BlendMode::BLEND_MODES[BLEND_TRANSLATION[overlay_data['Md  ']].to_sym]
+
+      width = layer.width.to_i
+      height = layer.height.to_i
+
+      PSD.logger.debug("Layer style: layer = #{layer.name}, type = color overlay, blend mode = #{blending_mode}")
+
+      for y in 0...height do
+        for x in 0...width do
+          pixel = png.get_pixel(x, y)
+          alpha = ChunkyPNG::Color.a(pixel)
+          next if alpha == 0
+
+          overlay_color = ChunkyPNG::Color.rgba(
+            color_data['Rd  '].round, 
+            color_data['Grn '].round,
+            color_data['Bl  '].round,
+            alpha
+          )
+
+          color = Compose.send(blending_mode, overlay_color, pixel)
+          png.set_pixel(x, y, color)
+        end
+      end
+    end
+  end
+end