psd 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc299dfcc8a9b41a3f17b16a204c2894668b5cc
-  data.tar.gz: bf991e614ddb7f6e151c42d6bcc627e7d34a1050
+  metadata.gz: 192aac571ad814510b059521913c776ada912bbe
+  data.tar.gz: 620ccea660e7c7a23ac20807b051f0bc26bd6d98
 SHA512:
-  metadata.gz: 96f2cbfb412549b89d2c4dc0bfa579c31c1c92e3451b0bf498adcbffafcdff48024ddc68625fc2db0c01910f22e195839efaaf84bdb137187bfc6d09411fa8e2
-  data.tar.gz: aaabac77598af888c915cc9e600c9ac393f7aff6cd1a3ea3e987a7186d7d698204669040f3f5eb2eb476fb1dbc408a148b18459736d721681536d667cff577ab
+  metadata.gz: c27e2806fcfd1091bd58b3888abbd082da8f87e80b263feef7ca31b31c32ca7946caffe0fce89d74685304aa1ab6a6cb3a74f8c41409dd243a7b4be044642c9d
+  data.tar.gz: 25cea6e8c71c7c707bac8b4a8f8dd8a7505af97e86e9a9d1cf6d9e323d14596888f2eb55fa8e4a4b48d37cf1dd7ce02ce013c57bfea91692a1cd198096e72962

data/README.md

@@ -94,7 +94,7 @@ psd.tree.descendant_layers.first.width
 PSD files also store various pieces of information in "layer info" blocks. Which blocks a layer has varies from layer-to-layer, but to access them you can do:
 
 ``` ruby
-psd.tree.descendant_layers.first.type.font
+psd.tree.descendant_layers.first.text[:font]
 
 # Returns
 {:name=>"HelveticaNeue-Light",
@@ -184,6 +184,5 @@ PSD.debug = true
 
 There are a few features that are currently missing from PSD.rb.
 
-* Individual layer image exporting
 * More image modes + depths for image exporting
 * A few layer info blocks

data/lib/psd/channel_image.rb

@@ -66,7 +66,7 @@ class PSD
       end
 
       if @channel_data.length != @length
-        PSD.logger.error "#{channel_data.length} read; expected #{@length}"
+        PSD.logger.error "#{@channel_data.length} read; expected #{@length}"
       end
 
       process_image_data
@@ -85,4 +85,4 @@ class PSD
       end
     end
   end
-end
+end

data/lib/psd/image.rb

@@ -26,22 +26,22 @@ class PSD
       @num_pixels *= 2 if depth == 16
 
       calculate_length
-      @channel_data = {} # Using a Hash over an NArray, because NArray has problems w/ Ruby 2.0. Hashes are faster than Arrays
+      @channel_data = []
+      @pixel_data = []
 
       @start_pos = @file.tell
       @end_pos = @start_pos + @length
 
-      @pixel_data = []
-
       PSD.logger.debug "Image: #{width}x#{height}, length = #{@length}, mode = #{@header.mode_name}, position = #{@start_pos}"
 
       # Each color channel is represented by a unique ID
       @channels_info = [
         {id: 0},
         {id: 1},
-        {id: 2},
-        {id: -1}
+        {id: 2}
       ]
+
+      @channels_info << {id: -1} if channels == 4
     end
 
     # Begins parsing the image by first figuring out the compression format used, and then
@@ -103,6 +103,8 @@ class PSD
       when 3 then combine_rgb_channel
       when 4 then combine_cmyk_channel
       end
+
+      @channel_data = nil
     end
 
     def pixel_step

data/lib/psd/image_exports/png.rb

@@ -7,26 +7,18 @@ class PSD::Image
       # Load the image pixels into a PNG file and return a reference to the
       # data.
       def to_png
-        @png ||= (
-          PSD.logger.debug "Beginning PNG export"
-          png = ChunkyPNG::Image.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
+        PSD.logger.debug "Beginning PNG export"
+        png = ChunkyPNG::Image.new(width.to_i, height.to_i, ChunkyPNG::Color::TRANSPARENT)
 
-          i = 0
-          height.times do |y|
-            width.times do |x|
-              png[x,y] = ChunkyPNG::Color.rgba(
-                @pixel_data[i],
-                @pixel_data[i+1],
-                @pixel_data[i+2],
-                @pixel_data[i+3]
-              )
-
-              i += 4
-            end
+        i = 0
+        height.times do |y|
+          width.times do |x|
+            png[x,y] = @pixel_data[i]
+            i += 1
           end
+        end
 
-          png
-        )
+        png
       end
       alias :export :to_png
 

data/lib/psd/image_formats/layer_rle.rb

@@ -14,8 +14,10 @@ class PSD
       end
 
       def parse_channel_data!
+        @line_index = 0
+
         PSD.logger.debug "Parsing layer RLE channel ##{@ch_info[:id]}: position = #{@chan_pos}"
-        @chan_pos = decode_rle_channel(@chan_pos, 0)
+        decode_rle_channel
       end
     end
   end

data/lib/psd/image_formats/rle.rb

@@ -11,30 +11,27 @@ class PSD
 
       def parse_byte_counts!
         byte_counts = []
-        channels.times do |i|
-          height.times do |j|
-            byte_counts << @file.read_short
-          end
+        (channels * height).times do |i|
+          byte_counts << @file.read_short
         end
 
         return byte_counts
       end
 
       def parse_channel_data!
-        chan_pos = 0
-        line_index = 0
+        @chan_pos = 0
+        @line_index = 0
 
         channels.times do |i|
-          PSD.logger.debug "Parsing RLE channel ##{i}: position = #{chan_pos}, line = #{line_index}"
-          chan_pos = decode_rle_channel(chan_pos, line_index)
-          line_index += height
+          PSD.logger.debug "Parsing RLE channel ##{i}: position = #{@chan_pos}, line = #{@line_index}"
+          decode_rle_channel
+          @line_index += height
         end
       end
 
-      def decode_rle_channel(chan_pos, line_index)
+      def decode_rle_channel
         height.times do |j|
-          byte_count = @byte_counts[line_index]
-          line_index += 1
+          byte_count = @byte_counts[@line_index + j]
           finish = @file.tell + byte_count
 
           while @file.tell < finish
@@ -42,26 +39,24 @@ class PSD
 
             if len < 128
               len += 1
-              (chan_pos...chan_pos+len).each do |k|
+              (@chan_pos...@chan_pos+len).each do |k|
                 @channel_data[k] = @file.read(1).bytes.to_a[0]
               end
 
-              chan_pos += len
+              @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|
+              (@chan_pos...@chan_pos+len).each do |k|
                 @channel_data[k] = val
               end
 
-              chan_pos += len
+              @chan_pos += len
             end
           end
         end
-
-        return chan_pos
       end
     end
   end

data/lib/psd/image_modes/cmyk.rb

@@ -21,7 +21,7 @@ class PSD
 
           rgb = PSD::Color.cmyk_to_rgb(255 - c, 255 - m, 255 - y, 255 - k)
 
-          @pixel_data.push *rgb.values, a
+          @pixel_data.push ChunkyPNG::rgba(*rgb.values, a)
         end
       end
     end

data/lib/psd/image_modes/greyscale.rb

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

data/lib/psd/image_modes/rgb.rb

@@ -12,7 +12,6 @@ class PSD
           a = 255
 
           @channels_info.each_with_index do |chan, index|
-            next if channels == 3 && chan[:id] == -1
             val = @channel_data[i + (@channel_length * index)]
 
             case chan[:id]
@@ -23,7 +22,7 @@ class PSD
             end
           end
 
-          @pixel_data.push r, g, b, a
+          @pixel_data.push ChunkyPNG::Color.rgba(r, g, b, a)
         end
       end
     end

data/lib/psd/version.rb

@@ -1,3 +1,3 @@
 class PSD
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/image_spec.rb

@@ -16,22 +16,20 @@ describe 'Image Exporting' do
       expect(@psd.image).to_not be_nil
       expect(@psd.image.width).to eq(1)
       expect(@psd.image.height).to eq(1)
-      expect(@psd.image.pixel_data).to eq([0, 100, 200, 255])
+      expect(@psd.image.pixel_data).to eq([ChunkyPNG::Color.rgba(0, 100, 200, 255)])
     end
 
     it "should be able to skip to the image" do
       expect(@psd).to_not be_parsed
       expect(@psd.image.width).to eq(1)
       expect(@psd.image.height).to eq(1)
-      expect(@psd.image.pixel_data).to eq([0, 100, 200, 255])
+      expect(@psd.image.pixel_data).to eq([ChunkyPNG::Color.rgba(0, 100, 200, 255)])
     end
 
     describe "as PNG" do
       it "should produce a valid PNG object" do
         expect(@psd.image.to_png).to be_an_instance_of(ChunkyPNG::Image)
 
-        # Ensure it's cached
-        expect(@psd.image.to_png).to be @psd.image.to_png
         expect(@psd.image.to_png.width).to eq(1)
         expect(@psd.image.to_png.height).to eq(1)
         expect(
@@ -51,7 +49,7 @@ describe 'Image Exporting' do
       expect(image.width).to eq(1)
       expect(image.height).to eq(1)
 
-      expect(image.pixel_data).to eq([0, 100, 200, 255])
+      expect(image.pixel_data).to eq([ChunkyPNG::Color.rgba(0, 100, 200, 255)])
     end
 
     describe "as PNG" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ryan LeFevre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -211,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.8
 signing_key: 
 specification_version: 4
 summary: General purpose library for parsing Photoshop files