Merge branch 'master' into channel_images

.travis.yml

 language: node_js
 node_js:
-  # - "0.11"
+  - "0.11"
   - "0.10"
-  # - "0.8"
\ No newline at end of file

Cakefile

@@ -9,7 +9,6 @@ task 'compile', 'Compile with browserify for the web', ->
   .transform('coffeeify')
   .require('./shims/png.coffee', expose: './image_exports/png.coffee')
   .require('./shims/init.coffee', expose: './psd/init.coffee')
-  .require('./shims/rgb.coffee', expose: './image_modes/rgb.coffee')
   .require('./lib/psd.coffee', expose: 'psd')
   .bundle (err, src) ->
     return console.log(err) if err?

README.md

@@ -4,13 +4,11 @@
 
 A general purpose PSD parser written in Coffeescript. Based off of [PSD.rb](https://github.com/layervault/psd.rb).
 
-Runs in both NodeJS and the browser (using browserify). There are still some pieces missing that are present in PSD.rb, such as layer comp filtering, a built-in renderer, and many layer info blocks. The eventual goal is full feature parity with PSD.rb.
+Runs in both NodeJS and the browser (using browserify). There are still some pieces missing that are present in PSD.rb, such as layer comp filtering, layer image exporting, a built-in renderer, and many layer info blocks. The eventual goal is full feature parity with PSD.rb.
 
 ## Installation
 
-Before installing from npm, you must install libpng, which is available on all popular package management systems. On OSX with homebrew, you can do `brew install libpng`. The install success for node-png is currently hit or miss, so alternate image packages are currently under consideration.
-
-Once your system is ready, simply add to your package.json dependencies or run `npm install psd`.
+PSD.js has no native dependencies. Simply add `psd` to your package.json or run `npm install psd`.
 
 ## Basic Usage
 

lib/psd/image_exports/png.coffee

 fs = require 'fs'
-{Png} = require 'png'
+{PNG} = require 'pngjs'
 RSVP = require 'rsvp'
 
 module.exports =
   toPng: ->
     new RSVP.Promise (resolve, reject) =>
-      png = new Png(new Buffer(@pixelData), @width(), @height(), 'rgba')
-      png.encode(resolve)
+      png = new PNG(filterType: 4, width: @width(), height: @height())
+
+      png.data = @pixelData
+      resolve(png)
 
   saveAsPng: (output) ->
     new RSVP.Promise (resolve, reject) =>
-      @toPng()
-        .then (image) ->
-          fs.writeFile output, image.toString('binary'), 'binary', resolve
-          
+      @toPng().then (image) ->
+        image
+          .pack()
+          .pipe(fs.createWriteStream(output))
+          .on 'finish', resolve

lib/psd/image_modes/rgb.coffee

@@ -5,13 +5,14 @@ module.exports =
       .filter (ch) -> ch >= -1
 
     for i in [0...@numPixels]
-      r = g = b = a = 0
+      r = g = b = 0
+      a = 255
 
       for chan, index in rgbChannels
         val = @channelData[i + (@channelLength * index)]
 
         switch chan
-          when -1 then a = 255 - val
+          when -1 then a = val
           when 0 then  r = val
           when 1 then  g = val
           when 2 then  b = val

package.json

 {
   "name": "psd",
   "description": "A general purpose Photoshop file parser.",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "./index.js",
   "keywords": ["psd", "parser", "photoshop", "adobe", "reader"],
   "repository": {
@@ -12,7 +12,7 @@
     "coffee-script": "~ 1.7.1",
     "jspack": "~ 0.0.3",
     "coffeescript-module": "~ 0.2.1",
-    "png": "~ 3.0.3",
+    "pngjs": "~ 0.4.0",
     "rsvp": "~ 3.0.6",
     "lodash": "~ 2.4"
   },

shims/rgb.coffee

-module.exports =
-  combineRgbChannel: ->
-    rgbChannels = @channelsInfo
-      .map (ch) -> ch.id
-      .filter (ch) -> ch >= -1
-
-    for i in [0...@numPixels]
-      r = g = b = 0
-      a = 255
-
-      for chan, index in rgbChannels
-        val = @channelData[i + (@channelLength * index)]
-
-        switch chan
-          when -1 then a = val
-          when 0 then  r = val
-          when 1 then  g = val
-          when 2 then  b = val
-
-      @pixelData.push r, g, b, a
\ No newline at end of file