Merge remote-tracking branch 'origin/master' into channel_images

LICENSE.txt

+The MIT License (MIT)
+
+Copyright (c) 2014 Ryan LeFevre
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/node/tree.js

@@ -5,4 +5,4 @@ var file = process.argv[2] || './examples/images/example.psd';
 var psd = PSD.fromFile(file);
 psd.parse();
 
-console.log(psd.tree().export());
\ No newline at end of file
+console.log(psd.tree().export());

lib/psd/file.coffee

 {jspack} = require 'jspack'
+iconv = require 'iconv-lite'
 Util = require './util.coffee'
 
 module.exports = class File
@@ -41,10 +42,7 @@ module.exports = class File
   readString: (length) -> String.fromCharCode.apply(null, @read(length)).replace /\u0000/g, ""
   readUnicodeString: (length = null) ->
     length or= @readInt()
-    @read(length * 2)
-      .map((c) -> Util.getUnicodeCharacter(c))
-      .join('')
-      .replace(/\u0000/g, '')
+    iconv.decode(new Buffer(@read(length * 2)),'utf-16be').replace /\u0000/g, ""
 
   readByte: -> @read(1)[0]
-  readBoolean: -> @readByte() isnt 0
\ No newline at end of file
+  readBoolean: -> @readByte() isnt 0

lib/psd/layer/info.coffee

@@ -13,6 +13,7 @@ LAYER_INFO = {
   name:                   require('../layer_info/unicode_name.coffee')
   nestedSectionDivider:   require('../layer_info/nested_section_divider.coffee')
   sectionDivider:         require('../layer_info/section_divider.coffee')
+  typeTool:               require('../layer_info/typetool.coffee')
 }
 
 module.exports =
@@ -40,4 +41,4 @@ module.exports =
         keyParseable = true
         break
 
-      @file.seek length, true if not keyParseable
\ No newline at end of file
+      @file.seek length, true if not keyParseable

lib/psd/layer_info/typetool.coffee

+LayerInfo = require '../layer_info.coffee'
+Descriptor = require '../descriptor.coffee'
+
+module.exports = class TextElements extends LayerInfo
+  @shouldParse: (key) -> key is 'TySh'
+
+  TRANSFORM_VALUE = ['xx', 'xy', 'yx', 'yy', 'tx', 'ty']
+  COORDS_VALUE = ['left', 'top', 'right', 'bottom']
+
+  constructor: (layer, length) ->
+    super(layer, length)
+
+    @version = null
+    @transform = {}
+    @textVersion = null
+    @descriptorVersion = null
+    @textData = null
+    @textValue = null
+    @warpVersion = null
+    @descriptorVersion = null
+    @warpData = null
+    @coords = {}
+
+  parse: ->
+    @version = @file.readShort()
+
+    for name, index in TRANSFORM_VALUE
+      @transform[name] = @file.readDouble()
+
+    @textVersion = @file.readShort()
+    @descriptorVersion = @file.readInt()
+
+    @textData = new Descriptor(@file).parse()
+    @textValue = @textData['Txt ']
+
+    @warpVersion = @file.readShort()
+
+    @descriptorVersion = @file.readInt()
+
+    @warpData = new Descriptor(@file).parse()
+
+    for name, index in COORDS_VALUE
+      @coords[name] = @file.readDouble()

package.json

@@ -14,7 +14,8 @@
     "coffeescript-module": "~ 0.2.1",
     "pngjs": "~ 0.4.0",
     "rsvp": "~ 3.0.6",
-    "lodash": "~ 2.4"
+    "lodash": "~ 2.4",
+    "iconv-lite": "~ 0.4.4"
   },
   "scripts": {
     "test": "mocha test"