From: sbarman <sbarman@L3CWZ5T.(none)>
Date: Wed, 15 Jun 2011 19:37:05 +0000 (-0700)
Subject: Merge branch 'master' of github.com:andreasgal/pdf.js
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=23aba03f4351c76a68e3f742c553e81834e72cb6;p=pdf.js.git

Merge branch 'master' of github.com:andreasgal/pdf.js

Conflicts:
	pdf.js
---

23aba03f4351c76a68e3f742c553e81834e72cb6
diff --cc pdf.js
index d4df524,3468c7b..2df975c
--- a/pdf.js
+++ b/pdf.js
@@@ -617,27 -617,6 +617,19 @@@ function IsRef(v) 
      return v instanceof Ref;
  }
  
 +function IsPDFFunction(v) {
 +    var fnDict;
 +    if (typeof v != "object")
 +        return false;
 +    else if (IsDict(v))
 +        fnDict = v;
 +    else if (IsStream(v))
 +        fnDict = v.dict;
 +    else
 +        return false;
 +    return fnDict.has("FunctionType");
 +}
 +
- function IsFunctionDict(v) {
-     return IsFunction(v) && IsDict(v);
- }
- 
- function IsFunctionStream(v) {
-     return IsFunction(v) && IsStream(v);
- }
- 
  var EOF = {};
  
  function IsEOF(v) {