From: Artur Adib <arturadib@gmail.com>
Date: Tue, 7 Feb 2012 00:11:52 +0000 (-0800)
Subject: Merge remote-tracking branch 'mozilla/master' into issue1133
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c49e9ec07aaedacda9ab68dfc8ecb3eb64afb7d3;p=pdf.js.git

Merge remote-tracking branch 'mozilla/master' into issue1133

Conflicts:
	src/util.js
	test/test_manifest.json
---

c49e9ec07aaedacda9ab68dfc8ecb3eb64afb7d3
diff --cc src/util.js
index caa523e,7aa6950..f00fcd1
--- a/src/util.js
+++ b/src/util.js
@@@ -97,20 -93,10 +97,24 @@@ var Util = (function UtilClosure() 
      return [xt, yt];
    };
  
 +  // Apply a generic 3d matrix M on a 3-vector v:
 +  //   | a b c |   | X |
 +  //   | d e f | x | Y |
 +  //   | g h i |   | Z |
 +  // M is assumed to be serialized as [a,b,c,d,e,f,g,h,i],
 +  // with v as [X,Y,Z]
 +  Util.apply3dTransform = function apply3d(m, v) {
 +    return [
 +      m[0] * v[0] + m[1] * v[1] + m[2] * v[2],
 +      m[3] * v[0] + m[4] * v[1] + m[5] * v[2],
 +      m[6] * v[0] + m[7] * v[1] + m[8] * v[2]
 +    ];
 +  }
 +
+   Util.sign = function sign(num) {
+     return num < 0 ? -1 : 1;
+   };
+ 
    return Util;
  })();
  
diff --cc test/test_manifest.json
index dd5c541,2b0541e..3a1b5bd
--- a/test/test_manifest.json
+++ b/test/test_manifest.json
@@@ -445,11 -445,11 +445,18 @@@
        "link": false,
        "type": "eq"
      },
 +    {  "id": "issue1133",
 +      "file": "pdfs/issue1133.pdf",
 +      "md5": "d1b61580cb100e3df93d33703af1773a",
 +      "rounds": 1,
 +      "link": true,
 +      "type": "eq"
++    },
+     {  "id": "issue1049",
+       "file": "pdfs/issue1049.pdf",
+       "md5": "15473fffcdde9fb8f3756a4cf1aab347",
+       "rounds": 1,
+       "link": true,
+       "type": "eq"
      }
  ]