aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormeltingice <meltingice8917@gmail.com>2012-07-17 23:05:56 -0400
committermeltingice <meltingice8917@gmail.com>2012-07-17 23:05:56 -0400
commit286d9c0f80eb53d682eb374b8cd1b7ba635c6f20 (patch)
treee12ee82ae2bdce74a0ff48f02dc2c80b6dd8f5ac
parentClean up string parsing function (diff)
downloadpsd.js-286d9c0f80eb53d682eb374b8cd1b7ba635c6f20.tar.xz
psd.js-286d9c0f80eb53d682eb374b8cd1b7ba635c6f20.zip
Update docs and version bump
-rw-r--r--docs/psd.html2
-rw-r--r--docs/psdfile.html5
-rw-r--r--docs/util.html2
-rw-r--r--package.json2
-rwxr-xr-xsrc/psd.coffee2
5 files changed, 6 insertions, 7 deletions
diff --git a/docs/psd.html b/docs/psd.html
index 56dd9d9..46750eb 100644
--- a/docs/psd.html
+++ b/docs/psd.html
@@ -2,7 +2,7 @@
<span class="nv">Root = </span><span class="nx">exports</span>
<span class="nv">fs = </span><span class="nx">require</span> <span class="s1">&#39;fs&#39;</span>
<span class="k">else</span>
- <span class="nv">Root = </span><span class="nb">window</span></pre></div> </td> </tr> <tr id="section-2"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-2">&#182;</a> </div> <p>Create our class and add to global scope</p> </td> <td class="code"> <div class="highlight"><pre><span class="nv">Root.PSD = </span><span class="k">class</span> <span class="nx">PSD</span></pre></div> </td> </tr> <tr id="section-3"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-3">&#182;</a> </div> <p>Version number</p> </td> <td class="code"> <div class="highlight"><pre> <span class="vi">@VERSION = </span><span class="s2">&quot;0.4.4&quot;</span></pre></div> </td> </tr> <tr id="section-4"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-4">&#182;</a> </div> <p>Enable/disable debugging console logs</p> </td> <td class="code"> <div class="highlight"><pre> <span class="vi">@DEBUG = </span><span class="kc">false</span></pre></div> </td> </tr> <tr id="section-5"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-5">&#182;</a> </div> <p>Loads a PSD from a file. If we're in node, then this loads the
+ <span class="nv">Root = </span><span class="nb">window</span></pre></div> </td> </tr> <tr id="section-2"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-2">&#182;</a> </div> <p>Create our class and add to global scope</p> </td> <td class="code"> <div class="highlight"><pre><span class="nv">Root.PSD = </span><span class="k">class</span> <span class="nx">PSD</span></pre></div> </td> </tr> <tr id="section-3"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-3">&#182;</a> </div> <p>Version number</p> </td> <td class="code"> <div class="highlight"><pre> <span class="vi">@VERSION = </span><span class="s2">&quot;0.4.5&quot;</span></pre></div> </td> </tr> <tr id="section-4"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-4">&#182;</a> </div> <p>Enable/disable debugging console logs</p> </td> <td class="code"> <div class="highlight"><pre> <span class="vi">@DEBUG = </span><span class="kc">false</span></pre></div> </td> </tr> <tr id="section-5"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-5">&#182;</a> </div> <p>Loads a PSD from a file. If we're in node, then this loads the
file from the filesystem. If we're in the browser, then this assumes
it has been passed a File object (either from a file input element,
or from HTML5 drag &amp; drop).</p> </td> <td class="code"> <div class="highlight"><pre> <span class="vi">@fromFile: </span><span class="nf">(file, cb = -&gt;) -&gt;</span>
diff --git a/docs/psdfile.html b/docs/psdfile.html
index 0f6be03..f5fd49b 100644
--- a/docs/psdfile.html
+++ b/docs/psdfile.html
@@ -34,9 +34,8 @@ store the int either as an octet string, or something more useful.</p>
<span class="nv">readULongLong: </span><span class="o">-&gt;</span> <span class="nx">@read</span><span class="p">(</span><span class="mi">8</span><span class="p">)</span></pre></div> </td> </tr> <tr id="section-13"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-13">&#182;</a> </div> <p>Reads a string with the given length. Because some strings are also
null-byte padded, we strip out these null bytes since they are of no
use to us in Javascript.</p> </td> <td class="code"> <div class="highlight"><pre> <span class="nv">readString: </span><span class="nf">(length) -&gt;</span>
- <span class="nv">ret = </span><span class="p">[]</span>
- <span class="nx">ret</span><span class="p">[</span><span class="nx">i</span><span class="p">]</span> <span class="o">=</span> <span class="nb">String</span><span class="p">.</span><span class="nx">fromCharCode</span><span class="p">(</span><span class="nx">@read</span><span class="p">(</span><span class="mi">1</span><span class="p">)[</span><span class="mi">0</span><span class="p">])</span> <span class="k">for</span> <span class="nx">i</span> <span class="k">in</span> <span class="p">[</span><span class="mi">0</span><span class="p">...</span><span class="nx">length</span><span class="p">]</span>
- <span class="nx">ret</span><span class="p">.</span><span class="nx">join</span><span class="p">(</span><span class="s1">&#39;&#39;</span><span class="p">).</span><span class="nx">replace</span> <span class="sr">/\u0000/g</span><span class="p">,</span> <span class="s2">&quot;&quot;</span>
+ <span class="nv">ret = </span><span class="nb">String</span><span class="p">.</span><span class="nx">fromCharCode</span><span class="p">.</span><span class="nx">apply</span> <span class="kc">null</span><span class="p">,</span> <span class="nx">@read</span><span class="p">(</span><span class="nx">length</span><span class="p">)</span>
+ <span class="nx">ret</span><span class="p">.</span><span class="nx">replace</span> <span class="sr">/\u0000/g</span><span class="p">,</span> <span class="s2">&quot;&quot;</span>
<span class="nv">readUnicodeString: </span><span class="o">-&gt;</span>
<span class="nv">len = </span><span class="nx">@readInt</span><span class="p">()</span> <span class="o">*</span> <span class="mi">2</span>
diff --git a/docs/util.html b/docs/util.html
index 1fdfda4..24b153f 100644
--- a/docs/util.html
+++ b/docs/util.html
@@ -1,6 +1,6 @@
<!DOCTYPE html> <html> <head> <title>util.coffee</title> <meta http-equiv="content-type" content="text/html; charset=UTF-8"> <link rel="stylesheet" media="all" href="docco.css" /> </head> <body> <div id="container"> <div id="background"></div> <div id="jump_to"> Jump To &hellip; <div id="jump_wrapper"> <div id="jump_page"> <a class="source" href="blackwhite.html"> blackwhite.coffee </a> <a class="source" href="brightnesscontrast.html"> brightnesscontrast.coffee </a> <a class="source" href="colorbalance.html"> colorbalance.coffee </a> <a class="source" href="curves.html"> curves.coffee </a> <a class="source" href="exposure.html"> exposure.coffee </a> <a class="source" href="gradient.html"> gradient.coffee </a> <a class="source" href="huesaturation.html"> huesaturation.coffee </a> <a class="source" href="invert.html"> invert.coffee </a> <a class="source" href="layereffect.html"> layereffect.coffee </a> <a class="source" href="levels.html"> levels.coffee </a> <a class="source" href="pattern.html"> pattern.coffee </a> <a class="source" href="photofilter.html"> photofilter.coffee </a> <a class="source" href="posterize.html"> posterize.coffee </a> <a class="source" href="selectivecolor.html"> selectivecolor.coffee </a> <a class="source" href="solidcolor.html"> solidcolor.coffee </a> <a class="source" href="threshold.html"> threshold.coffee </a> <a class="source" href="typetool.html"> typetool.coffee </a> <a class="source" href="vibrance.html"> vibrance.coffee </a> <a class="source" href="log.html"> log.coffee </a> <a class="source" href="psd.html"> psd.coffee </a> <a class="source" href="psdassert.html"> psdassert.coffee </a> <a class="source" href="psdchannelimage.html"> psdchannelimage.coffee </a> <a class="source" href="psdcolor.html"> psdcolor.coffee </a> <a class="source" href="psddescriptor.html"> psddescriptor.coffee </a> <a class="source" href="psdfile.html"> psdfile.coffee </a> <a class="source" href="psdheader.html"> psdheader.coffee </a> <a class="source" href="psdimage.html"> psdimage.coffee </a> <a class="source" href="psdlayer.html"> psdlayer.coffee </a> <a class="source" href="psdlayermask.html"> psdlayermask.coffee </a> <a class="source" href="psdresource.html"> psdresource.coffee </a> <a class="source" href="util.html"> util.coffee </a> </div> </div> </div> <table cellpadding="0" cellspacing="0"> <thead> <tr> <th class="docs"> <h1> util.coffee </h1> </th> <th class="code"> </th> </tr> </thead> <tbody> <tr id="section-1"> <td class="docs"> <div class="pilwrap"> <a class="pilcrow" href="#section-1">&#182;</a> </div> <p>"Static" utility functions</p> </td> <td class="code"> <div class="highlight"><pre><span class="k">class</span> <span class="nx">Util</span>
<span class="vi">@pad2: </span><span class="nf">(i) -&gt;</span> <span class="nb">Math</span><span class="p">.</span><span class="nx">floor</span><span class="p">((</span><span class="nx">i</span> <span class="o">+</span> <span class="mi">1</span><span class="p">)</span> <span class="o">/</span> <span class="mi">2</span><span class="p">)</span> <span class="o">*</span> <span class="mi">2</span>
- <span class="vi">@pad4: </span><span class="nf">(i) -&gt;</span> <span class="p">(((</span><span class="nx">i</span> <span class="o">&amp;</span> <span class="mh">0xFF</span><span class="p">)</span> <span class="o">+</span> <span class="mi">1</span> <span class="o">+</span> <span class="mi">3</span><span class="p">)</span> <span class="o">&amp;</span> <span class="o">~</span><span class="mh">0x03</span><span class="p">)</span> <span class="o">-</span> <span class="mi">1</span>
+ <span class="vi">@pad4: </span><span class="nf">(i) -&gt;</span> <span class="nx">i</span> <span class="o">-</span> <span class="p">(</span><span class="nx">i</span> <span class="o">%</span> <span class="mi">4</span><span class="p">)</span> <span class="o">+</span> <span class="mi">3</span>
<span class="vi">@toUInt16: </span><span class="nf">(b1, b2) -&gt;</span> <span class="p">(</span><span class="nx">b1</span> <span class="o">&lt;&lt;</span> <span class="mi">8</span><span class="p">)</span> <span class="o">|</span> <span class="nx">b2</span>
<span class="vi">@toInt16: </span><span class="nf">(b1, b2) -&gt;</span>
diff --git a/package.json b/package.json
index 90434f3..bdceaed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "psd",
- "version": "0.4.4",
+ "version": "0.4.5",
"description": "A Photoshop file format (PSD) parser written in Coffeescript/Javascript",
"homepage": "http://meltingice.github.com/psd.js/",
"author": "Ryan LeFevre <ryan@twitpic.com> (http://meltingice.net/)",
diff --git a/src/psd.coffee b/src/psd.coffee
index 2ed7f58..a198d1e 100755
--- a/src/psd.coffee
+++ b/src/psd.coffee
@@ -8,7 +8,7 @@ else
# Create our class and add to global scope
Root.PSD = class PSD
# Version number
- @VERSION = "0.4.4"
+ @VERSION = "0.4.5"
# Enable/disable debugging console logs
@DEBUG = false