From fcc4dfd9b5e619a8ffe48fa4ea2db15a440159a9 Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Wed, 21 May 2014 13:06:23 -0500 Subject: [PATCH] Moves shared/function.js to core/ --- examples/acroforms/index.html | 1 - examples/helloworld/index.html | 1 - make.js | 1 - src/{shared => core}/function.js | 17 ++++++++++++++++- src/shared/util.js | 14 -------------- src/worker_loader.js | 2 +- test/font/font_test.html | 2 +- test/test_slave.html | 1 - test/unit/unit_test.html | 2 +- web/viewer.html | 1 - 10 files changed, 19 insertions(+), 23 deletions(-) rename src/{shared => core}/function.js (98%) diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html index 6acdaefbd..5ac3fdc7f 100644 --- a/examples/acroforms/index.html +++ b/examples/acroforms/index.html @@ -5,7 +5,6 @@ - diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html index d303e6728..b38060bf8 100644 --- a/examples/helloworld/index.html +++ b/examples/helloworld/index.html @@ -5,7 +5,6 @@ - diff --git a/make.js b/make.js index 40de70fbd..60a126bfe 100644 --- a/make.js +++ b/make.js @@ -370,7 +370,6 @@ target.bundle = function(args) { var SHARED_SRC_FILES = [ 'shared/util.js', - 'shared/function.js', 'shared/annotation.js', ]; diff --git a/src/shared/function.js b/src/core/function.js similarity index 98% rename from src/shared/function.js rename to src/core/function.js index b6e0f3a9c..dd4507c31 100644 --- a/src/shared/function.js +++ b/src/core/function.js @@ -14,7 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -/* globals PostScriptLexer, PostScriptParser, error, info, isArray, isBool */ +/* globals PostScriptLexer, PostScriptParser, error, info, isArray, isBool, + isDict, isStream */ 'use strict'; @@ -436,6 +437,20 @@ var PDFFunction = (function PDFFunctionClosure() { }; })(); +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 PostScriptStack = (function PostScriptStackClosure() { var MAX_STACK_SIZE = 100; function PostScriptStack(initialStack) { diff --git a/src/shared/util.js b/src/shared/util.js index de115ce93..6898ca30b 100644 --- a/src/shared/util.js +++ b/src/shared/util.js @@ -963,20 +963,6 @@ 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'); -} - /** * Promise Capability object. * diff --git a/src/worker_loader.js b/src/worker_loader.js index 0aca59d10..6a8ddbfd4 100644 --- a/src/worker_loader.js +++ b/src/worker_loader.js @@ -21,7 +21,6 @@ // List of shared files to include; var sharedFiles = [ 'shared/util.js', - 'shared/function.js', 'shared/annotation.js' ]; @@ -34,6 +33,7 @@ var otherFiles = [ 'core/obj.js', 'core/charsets.js', 'core/cidmaps.js', + 'core/function.js', 'core/colorspace.js', 'core/crypto.js', 'core/pattern.js', diff --git a/test/font/font_test.html b/test/font/font_test.html index 1003ae239..743363fbc 100644 --- a/test/font/font_test.html +++ b/test/font/font_test.html @@ -22,7 +22,7 @@ - + diff --git a/test/test_slave.html b/test/test_slave.html index 195400f39..1e03be43c 100644 --- a/test/test_slave.html +++ b/test/test_slave.html @@ -20,7 +20,6 @@ limitations under the License. pdf.js test slave - diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html index 02fc98abf..2db04b1e8 100644 --- a/test/unit/unit_test.html +++ b/test/unit/unit_test.html @@ -21,7 +21,7 @@ - + diff --git a/web/viewer.html b/web/viewer.html index d16416d1c..39c05a220 100644 --- a/web/viewer.html +++ b/web/viewer.html @@ -48,7 +48,6 @@ http://sourceforge.net/adobe/cmap/wiki/License/ -