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

Conflicts:
	pdf.js

diff --cc pdf.js
index d4df52452f9e4968cd07bfe3220a18341b83e78d,3468c7b883c2820ce15b30cc56ce26d49223731d..2df975c734cf6337ded69fee81704fe72d0055c1
--- 1/pdf.js
--- 2/pdf.js
+++ b/pdf.js
@@@ -617,27 -617,6 +617,19 @@@ function IsRef(v) 
      return v instanceof Ref;
  }
  
- function IsFunctionDict(v) {
-     return IsFunction(v) && IsDict(v);
- }
- 
- function IsFunctionStream(v) {
-     return IsFunction(v) && IsStream(v);
- }
- 
 +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");
 +}
 +
  var EOF = {};
  
  function IsEOF(v) {