From 7a190851597f1540e0c7c412a1c3bde3c3eef451 Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Wed, 21 May 2014 12:57:15 -0500
Subject: [PATCH] Moves shared/colorspace.js into core/

---
 examples/acroforms/index.html      | 1 -
 examples/helloworld/index.html     | 1 -
 make.js                            | 1 -
 src/{shared => core}/colorspace.js | 0
 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 -
 9 files changed, 3 insertions(+), 8 deletions(-)
 rename src/{shared => core}/colorspace.js (100%)

diff --git a/examples/acroforms/index.html b/examples/acroforms/index.html
index b91b79c76..6acdaefbd 100644
--- a/examples/acroforms/index.html
+++ b/examples/acroforms/index.html
@@ -5,7 +5,6 @@
   <!-- In production, only one script (pdf.js) is necessary -->
   <!-- In production, change the content of PDFJS.workerSrc below -->
   <script src="../../src/shared/util.js"></script>
-  <script src="../../src/shared/colorspace.js"></script>
   <script src="../../src/shared/function.js"></script>
   <script src="../../src/shared/annotation.js"></script>
   <script src="../../src/display/api.js"></script>
diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html
index 651e6a5a6..d303e6728 100644
--- a/examples/helloworld/index.html
+++ b/examples/helloworld/index.html
@@ -5,7 +5,6 @@
   <!-- In production, only one script (pdf.js) is necessary -->
   <!-- In production, change the content of PDFJS.workerSrc below -->
   <script src="../../src/shared/util.js"></script>
-  <script src="../../src/shared/colorspace.js"></script>
   <script src="../../src/shared/function.js"></script>
   <script src="../../src/shared/annotation.js"></script>
   <script src="../../src/display/api.js"></script>
diff --git a/make.js b/make.js
index a93adc839..40de70fbd 100644
--- a/make.js
+++ b/make.js
@@ -370,7 +370,6 @@ target.bundle = function(args) {
 
   var SHARED_SRC_FILES = [
     'shared/util.js',
-    'shared/colorspace.js',
     'shared/function.js',
     'shared/annotation.js',
   ];
diff --git a/src/shared/colorspace.js b/src/core/colorspace.js
similarity index 100%
rename from src/shared/colorspace.js
rename to src/core/colorspace.js
diff --git a/src/worker_loader.js b/src/worker_loader.js
index 9cbda7e7b..0aca59d10 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/colorspace.js',
   'shared/function.js',
   'shared/annotation.js'
 ];
@@ -35,6 +34,7 @@ var otherFiles = [
   'core/obj.js',
   'core/charsets.js',
   'core/cidmaps.js',
+  'core/colorspace.js',
   'core/crypto.js',
   'core/pattern.js',
   'core/evaluator.js',
diff --git a/test/font/font_test.html b/test/font/font_test.html
index 5de571700..1003ae239 100644
--- a/test/font/font_test.html
+++ b/test/font/font_test.html
@@ -25,7 +25,7 @@
   <script src="../../src/shared/function.js"></script>
   <script src="../../src/core/charsets.js"></script>
   <script src="../../src/core/cidmaps.js"></script>
-  <script src="../../src/shared/colorspace.js"></script>
+  <script src="../../src/core/colorspace.js"></script>
   <script src="../../src/core/crypto.js"></script>
   <script src="../../src/core/pattern.js"></script>
   <script src="../../src/core/evaluator.js"></script>
diff --git a/test/test_slave.html b/test/test_slave.html
index f7deb481d..195400f39 100644
--- a/test/test_slave.html
+++ b/test/test_slave.html
@@ -20,7 +20,6 @@ limitations under the License.
     <title>pdf.js test slave</title>
     <style type="text/css"></style>
     <script src="/src/shared/util.js"></script>
-    <script src="/src/shared/colorspace.js"></script>
     <script src="/src/shared/function.js"></script>
     <script src="/src/shared/annotation.js"></script>
     <script src="/src/display/api.js"></script>
diff --git a/test/unit/unit_test.html b/test/unit/unit_test.html
index 742f47219..02fc98abf 100644
--- a/test/unit/unit_test.html
+++ b/test/unit/unit_test.html
@@ -24,7 +24,7 @@
   <script src="../../src/shared/function.js"></script>
   <script src="../../src/core/charsets.js"></script>
   <script src="../../src/core/cidmaps.js"></script>
-  <script src="../../src/shared/colorspace.js"></script>
+  <script src="../../src/core/colorspace.js"></script>
   <script src="../../src/core/crypto.js"></script>
   <script src="../../src/core/pattern.js"></script>
   <script src="../../src/core/evaluator.js"></script>
diff --git a/web/viewer.html b/web/viewer.html
index ecc4085ea..d16416d1c 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -48,7 +48,6 @@ http://sourceforge.net/adobe/cmap/wiki/License/
 
 <!--#if !PRODUCTION-->
     <script src="../src/shared/util.js"></script>
-    <script src="../src/shared/colorspace.js"></script>
     <script src="../src/shared/function.js"></script>
     <script src="../src/shared/annotation.js"></script>
     <script src="../src/display/api.js"></script>