Moved decoders to their own folder. Fixes #383.

ivmartel · Sep 4, 2017 · defb3ed · defb3ed
1 parent acd2d3e
commit defb3ed
Show file tree

Hide file tree

Showing 27 changed files with 74 additions and 71 deletions.
diff --git a/ext/pdfjs/arithmetic_decoder.js → decoders/pdfjs/arithmetic_decoder.js b/ext/pdfjs/arithmetic_decoder.js → decoders/pdfjs/arithmetic_decoder.js
diff --git a/ext/pdfjs/decode-jpeg2000.js → decoders/pdfjs/decode-jpeg2000.js b/ext/pdfjs/decode-jpeg2000.js → decoders/pdfjs/decode-jpeg2000.js
diff --git a/ext/pdfjs/decode-jpegbaseline.js → decoders/pdfjs/decode-jpegbaseline.js b/ext/pdfjs/decode-jpegbaseline.js → decoders/pdfjs/decode-jpegbaseline.js
diff --git a/ext/pdfjs/jpg.js → decoders/pdfjs/jpg.js b/ext/pdfjs/jpg.js → decoders/pdfjs/jpg.js
diff --git a/ext/pdfjs/jpx.js → decoders/pdfjs/jpx.js b/ext/pdfjs/jpx.js → decoders/pdfjs/jpx.js
diff --git a/ext/pdfjs/readme.md → decoders/pdfjs/readme.md b/ext/pdfjs/readme.md → decoders/pdfjs/readme.md
diff --git a/ext/pdfjs/util.js → decoders/pdfjs/util.js b/ext/pdfjs/util.js → decoders/pdfjs/util.js
diff --git a/ext/rii-mango/decode-jpegloss.js → decoders/rii-mango/decode-jpegloss.js b/ext/rii-mango/decode-jpegloss.js → decoders/rii-mango/decode-jpegloss.js
diff --git a/ext/rii-mango/lossless-min.js → decoders/rii-mango/lossless-min.js b/ext/rii-mango/lossless-min.js → decoders/rii-mango/lossless-min.js
diff --git a/ext/rii-mango/lossless.js → decoders/rii-mango/lossless.js b/ext/rii-mango/lossless.js → decoders/rii-mango/lossless.js
diff --git a/ext/rii-mango/readme.md → decoders/rii-mango/readme.md b/ext/rii-mango/readme.md → decoders/rii-mango/readme.md
diff --git a/resources/conquest/dwv-mobile.lua b/resources/conquest/dwv-mobile.lua
@@ -95,12 +95,13 @@ print([[
 <script type="text/javascript" src="/dwv/ext/jquery/jquery-2.1.4.min.js"></script>
 <script type="text/javascript" src="/dwv/ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
 <script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="/dwv/ext/rii-mango/lossless-min.js"></script>
 <script type="text/javascript" src="/dwv/ext/ext/konva/konva.min.js"></script>
+<!-- Decoders -->
+<script type="text/javascript" src="/dwv/decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="/dwv/decoders/rii-mango/lossless-min.js"></script>
 
 <!-- Local -->
 <script type="text/javascript" src="/dwv/dwv-0.21.0-beta.min.js"></script>

diff --git a/resources/conquest/dwv-simple.lua b/resources/conquest/dwv-simple.lua
@@ -88,11 +88,12 @@ print([[
 <!-- Third party -->
 <script type="text/javascript" src="/dwv/ext/jquery/jquery-2.1.4.min.js"></script>
 <script type="text/javascript" src="/dwv/ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="/dwv/ext/rii-mango/lossless-min.js"></script>
+<!-- Decoders -->
+<script type="text/javascript" src="/dwv/decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="/dwv/decoders/rii-mango/lossless-min.js"></script>
 
 <!-- Local -->
 <script type="text/javascript" src="/dwv/dwv-0.21.0-beta.min.js"></script>

diff --git a/resources/conquest/dwv-static.lua b/resources/conquest/dwv-static.lua
@@ -101,12 +101,13 @@ print([[
 <script type="text/javascript" src="/dwv/ext/jquery/jquery-2.1.4.min.js"></script>
 <script type="text/javascript" src="/dwv/ext/jquery-ui/jquery-ui-1.12.0.min.js"></script>
 <script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="/dwv/ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="/dwv/ext/rii-mango/lossless-min.js"></script>
 <script type="text/javascript" src="/dwv/ext/ext/konva/konva.min.js"></script>
+<!-- Decoders -->
+<script type="text/javascript" src="/dwv/decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="/dwv/decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="/dwv/decoders/rii-mango/lossless-min.js"></script>
 
 <!-- Local -->
 <script type="text/javascript" src="/dwv/dwv-0.21.0-beta.min.js"></script>

diff --git a/tests/visual/appgui.js b/tests/visual/appgui.js
@@ -12,9 +12,9 @@ dwv.tool.defaultpresets = {};
 
 // Image decoders (for web workers)
 dwv.image.decoderScripts = {
-    "jpeg2000": "../../ext/pdfjs/decode-jpeg2000.js",
-    "jpeg-lossless": "../../ext/rii-mango/decode-jpegloss.js",
-    "jpeg-baseline": "../../ext/pdfjs/decode-jpegbaseline.js"
+    "jpeg2000": "../../decoders/pdfjs/decode-jpeg2000.js",
+    "jpeg-lossless": "../../decoders/rii-mango/decode-jpegloss.js",
+    "jpeg-baseline": "../../decoders/pdfjs/decode-jpegbaseline.js"
 };
 
 // Window

diff --git a/tests/visual/index-jpeg.html b/tests/visual/index-jpeg.html
@@ -34,8 +34,8 @@
 <!-- Third party (dwv) -->
 <script type="text/javascript" src="../../ext/modernizr/modernizr.js"></script>
 <!-- Third party (load) -->
-<script type="text/javascript" src="../../ext/rii-mango/lossless-min.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="../../decoders/rii-mango/lossless-min.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpg.js"></script>
 <!-- Local -->
 <script type="text/javascript" src="../../src/app/application.js"></script>
 <script type="text/javascript" src="../../src/app/viewController.js"></script>

diff --git a/tests/visual/index-jpeg2000.html b/tests/visual/index-jpeg2000.html
@@ -34,9 +34,9 @@
 <!-- Third party (dwv) -->
 <script type="text/javascript" src="../../ext/modernizr/modernizr.js"></script>
 <!-- Third party (load) -->
-<script type="text/javascript" src="../../ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/arithmetic_decoder.js"></script>
 <!-- Local -->
 <script type="text/javascript" src="../../src/app/application.js"></script>
 <script type="text/javascript" src="../../src/app/viewController.js"></script>

diff --git a/viewers/mobile/applauncher.js b/viewers/mobile/applauncher.js
@@ -53,9 +53,9 @@ function startApp() {
 
 // Image decoders (for web workers)
 dwv.image.decoderScripts = {
-    "jpeg2000": "../../ext/pdfjs/decode-jpeg2000.js",
-    "jpeg-lossless": "../../ext/rii-mango/decode-jpegloss.js",
-    "jpeg-baseline": "../../ext/pdfjs/decode-jpegbaseline.js"
+    "jpeg2000": "../../decoders/pdfjs/decode-jpeg2000.js",
+    "jpeg-lossless": "../../decoders/rii-mango/decode-jpegloss.js",
+    "jpeg-baseline": "../../decoders/pdfjs/decode-jpegbaseline.js"
 };
 
 // check browser support

diff --git a/viewers/mobile/cache.manifest b/viewers/mobile/cache.manifest
@@ -64,14 +64,14 @@ appgui.js
 /dwv/demo/stable/ext/nprogress/nprogress.js
 /dwv/demo/stable/ext/flot/jquery.flot.min.js
 # js: decoders
-/dwv/demo/stable/ext/pdfjs/jpx.js
-/dwv/demo/stable/ext/pdfjs/arithmetic_decoder.js
-/dwv/demo/stable/ext/pdfjs/decode-jpeg2000.js
-/dwv/demo/stable/ext/pdfjs/util.js
-/dwv/demo/stable/ext/pdfjs/jpg.js
-/dwv/demo/stable/ext/pdfjs/decode-jpegbaseline.js
-/dwv/demo/stable/ext/rii-mango/lossless-min.js
-/dwv/demo/stable/ext/rii-mango/decode-jpegloss.js
+/dwv/demo/stable/decoders/pdfjs/jpx.js
+/dwv/demo/stable/decoders/pdfjs/arithmetic_decoder.js
+/dwv/demo/stable/decoders/pdfjs/decode-jpeg2000.js
+/dwv/demo/stable/decoders/pdfjs/util.js
+/dwv/demo/stable/decoders/pdfjs/jpg.js
+/dwv/demo/stable/decoders/pdfjs/decode-jpegbaseline.js
+/dwv/demo/stable/decoders/rii-mango/lossless-min.js
+/dwv/demo/stable/decoders/rii-mango/decode-jpegloss.js
 
 NETWORK:
 *
diff --git a/viewers/mobile/index.html b/viewers/mobile/index.html
@@ -58,11 +58,11 @@
 <script type="text/javascript" src="../../ext/nprogress/nprogress.js"></script>
 <script type="text/javascript" src="../../ext/flot/jquery.flot.min.js"></script>
 <!-- decoders -->
-<script type="text/javascript" src="../../ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="../../ext/rii-mango/lossless-min.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="../../decoders/rii-mango/lossless-min.js"></script>
 <!-- Local -->
 <script type="text/javascript" src="../../src/app/application.js"></script>
 <script type="text/javascript" src="../../src/app/drawController.js"></script>

diff --git a/viewers/simple/applauncher.js b/viewers/simple/applauncher.js
@@ -19,9 +19,9 @@ function startApp() {
 
 // Image decoders (for web workers)
 dwv.image.decoderScripts = {
-    "jpeg2000": "../../ext/pdfjs/decode-jpeg2000.js",
-    "jpeg-lossless": "../../ext/rii-mango/decode-jpegloss.js",
-    "jpeg-baseline": "../../ext/pdfjs/decode-jpegbaseline.js"
+    "jpeg2000": "../../decoders/pdfjs/decode-jpeg2000.js",
+    "jpeg-lossless": "../../decoders/rii-mango/decode-jpegloss.js",
+    "jpeg-baseline": "../../decoders/pdfjs/decode-jpegbaseline.js"
 };
 
 // check browser support

diff --git a/viewers/simple/index.html b/viewers/simple/index.html
@@ -29,11 +29,11 @@
 <script type="text/javascript" src="../../ext/jquery/jquery-2.1.4.min.js"></script>
 <script type="text/javascript" src="../../ext/jquery-mobile/jquery.mobile-1.4.5.min.js"></script>
 <!-- decoders -->
-<script type="text/javascript" src="../../ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="../../ext/rii-mango/lossless-min.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="../../decoders/rii-mango/lossless-min.js"></script>
 <!-- Local -->
 <script type="text/javascript" src="../../src/app/application.js"></script>
 <script type="text/javascript" src="../../src/app/drawController.js"></script>

diff --git a/viewers/simplistic/applauncher.js b/viewers/simplistic/applauncher.js
@@ -19,9 +19,9 @@ function startApp() {
 
 // Image decoders (for web workers)
 dwv.image.decoderScripts = {
-    "jpeg2000": "../../ext/pdfjs/decode-jpeg2000.js",
-    "jpeg-lossless": "../../ext/rii-mango/decode-jpegloss.js",
-    "jpeg-baseline": "../../ext/pdfjs/decode-jpegbaseline.js"
+    "jpeg2000": "../../decoders/pdfjs/decode-jpeg2000.js",
+    "jpeg-lossless": "../../decoders/rii-mango/decode-jpegloss.js",
+    "jpeg-baseline": "../../decoders/pdfjs/decode-jpegbaseline.js"
 };
 
 // check browser support

diff --git a/viewers/simplistic/index.html b/viewers/simplistic/index.html
@@ -39,11 +39,11 @@
 <script type="text/javascript" src="../../ext/i18next/i18nextXHRBackend.min.js"></script>
 <script type="text/javascript" src="../../ext/i18next/i18nextBrowserLanguageDetector.min.js"></script>
 <!-- decoders -->
-<script type="text/javascript" src="../../ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="../../ext/rii-mango/lossless-min.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="../../decoders/rii-mango/lossless-min.js"></script>
 <!-- Local -->
 <script type="text/javascript" src="../../src/app/application.js"></script>
 <script type="text/javascript" src="../../src/app/drawController.js"></script>

diff --git a/viewers/static/applauncher.js b/viewers/static/applauncher.js
@@ -28,9 +28,9 @@ function startApp() {
 
 // Image decoders (for web workers)
 dwv.image.decoderScripts = {
-    "jpeg2000": "../../ext/pdfjs/decode-jpeg2000.js",
-    "jpeg-lossless": "../../ext/rii-mango/decode-jpegloss.js",
-    "jpeg-baseline": "../../ext/pdfjs/decode-jpegbaseline.js"
+    "jpeg2000": "../../decoders/pdfjs/decode-jpeg2000.js",
+    "jpeg-lossless": "../../decoders/rii-mango/decode-jpegloss.js",
+    "jpeg-baseline": "../../decoders/pdfjs/decode-jpegbaseline.js"
 };
 
 // check browser support

diff --git a/viewers/static/cache.manifest b/viewers/static/cache.manifest
@@ -61,14 +61,14 @@ appgui.js
 /dwv/demo/stable/ext/jquery-ui/jquery-ui-1.12.0.min.js
 /dwv/demo/stable/ext/flot/jquery.flot.min.js
 # js: decoders
-/dwv/demo/stable/ext/pdfjs/jpx.js
-/dwv/demo/stable/ext/pdfjs/arithmetic_decoder.js
-/dwv/demo/stable/ext/pdfjs/decode-jpeg2000.js
-/dwv/demo/stable/ext/pdfjs/util.js
-/dwv/demo/stable/ext/pdfjs/jpg.js
-/dwv/demo/stable/ext/pdfjs/decode-jpegbaseline.js
-/dwv/demo/stable/ext/rii-mango/lossless-min.js
-/dwv/demo/stable/ext/rii-mango/decode-jpegloss.js
+/dwv/demo/stable/decoders/pdfjs/jpx.js
+/dwv/demo/stable/decoders/pdfjs/arithmetic_decoder.js
+/dwv/demo/stable/decoders/pdfjs/decode-jpeg2000.js
+/dwv/demo/stable/decoders/pdfjs/util.js
+/dwv/demo/stable/decoders/pdfjs/jpg.js
+/dwv/demo/stable/decoders/pdfjs/decode-jpegbaseline.js
+/dwv/demo/stable/decoders/rii-mango/lossless-min.js
+/dwv/demo/stable/decoders/rii-mango/decode-jpegloss.js
 
 NETWORK:
 *
diff --git a/viewers/static/index.html b/viewers/static/index.html
@@ -49,11 +49,11 @@
 <script type="text/javascript" src="../../ext/jquery-ui/jquery-ui-1.12.0.min.js"></script>
 <script type="text/javascript" src="../../ext/flot/jquery.flot.min.js"></script>
 <!-- decoders -->
-<script type="text/javascript" src="../../ext/pdfjs/jpx.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/util.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/arithmetic_decoder.js"></script>
-<script type="text/javascript" src="../../ext/pdfjs/jpg.js"></script>
-<script type="text/javascript" src="../../ext/rii-mango/lossless-min.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpx.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/util.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/arithmetic_decoder.js"></script>
+<script type="text/javascript" src="../../decoders/pdfjs/jpg.js"></script>
+<script type="text/javascript" src="../../decoders/rii-mango/lossless-min.js"></script>
 <!-- Local -->
 <script type="text/javascript" src="../../src/app/application.js"></script>
 <script type="text/javascript" src="../../src/app/drawController.js"></script>