Support for jpeg image stacks. See https://bugs.edge.launchpad.net/bookreader/+bug...

diff --git a/BookReaderIA/datanode/BookReaderImages.php b/BookReaderIA/datanode/BookReaderImages.php
index d009557..d131921 100644 (file)
--- a/BookReaderIA/datanode/BookReaderImages.php
+++ b/BookReaderIA/datanode/BookReaderImages.php
@@ -175,20 +175,15 @@ if ('jp2' == $fileExt) {
     // We use the BookReaderTiff prefix to give a hint in case things don't
     // get cleaned up.
     $tempFile = tempnam("/tmp", "BookReaderTiff");
-    
-    if (1 != $scale) {
-        if (onPowerNode()) {
-            $pbmReduce = ' | pnmscale -reduce ' . $scale;
-        } else {
-            $pbmReduce = ' | pnmscale -nomix -reduce ' . $scale;
-        }
-    } else {
-        $pbmReduce = '';
-    }
+
+    $pbmReduce = reduceCommand($scale);
     
     $decompressCmd = 
         ' > ' . $tempFile . ' ; tifftopnm ' . $tempFile . ' 2>/dev/null' . $pbmReduce;
-
+        
+} else if ('jpg' == $fileExt) {
+    $decompressCmd = ' | jpegtopnm ' . reduceCommand($scale);
+    
 } else {
     BRfatal('Unknown source file extension: ' . $fileExt);
 }
@@ -204,7 +199,12 @@ if ('jpg' == $ext) {
     $compressCmd = ' | pnmtopng ' . $pngOptions;
 }
 
-$cmd = $unzipCmd . $decompressCmd . $compressCmd;
+if (($ext == $fileExt) && ($scale == 1) && ($rotate === "0")) {
+    // Just pass through original data if same format and size
+    $cmd = $unzipCmd;
+} else {
+    $cmd = $unzipCmd . $decompressCmd . $compressCmd;
+}
 
 # print $cmd;
 
@@ -236,6 +236,18 @@ function onPowerNode() {
     return false;
 }
 
+function reduceCommand($scale) {
+    if (1 != $scale) {
+        if (onPowerNode()) {
+            return ' | pnmscale -reduce ' . $scale;
+        } else {
+            return ' | pnmscale -nomix -reduce ' . $scale;
+        }
+    } else {
+        return '';
+    }
+}
+
 
 ?>
 

diff --git a/BookReaderIA/datanode/BookReaderJSIA.php b/BookReaderIA/datanode/BookReaderJSIA.php
index 297f717..dabfd46 100755 (executable)
--- a/BookReaderIA/datanode/BookReaderJSIA.php
+++ b/BookReaderIA/datanode/BookReaderJSIA.php
@@ -456,7 +456,7 @@ function shouldAddPage($page) {
 function findImageStack($subPrefix, $filesData) {
 
     // $$$ Add jpeg here
-    $imageFormats = array('TIFF' => 'tif', 'JP2' => 'jp2');
+    $imageFormats = array('TIFF' => 'tif', 'JP2' => 'jp2', 'JPEG' => 'jpg');
     $archiveFormats = array('ZIP' => 'zip', 'Tar' => 'tar');
     $imageGroup = implode('|', array_keys($imageFormats));
     $archiveGroup = implode('|', array_keys($archiveFormats));

diff --git a/BookReaderIA/inc/BookReader.inc b/BookReaderIA/inc/BookReader.inc
index 0f233af..bcc6586 100644 (file)
--- a/BookReaderIA/inc/BookReader.inc
+++ b/BookReaderIA/inc/BookReader.inc
@@ -19,7 +19,7 @@ class BookReader
     // $$$ TODO add support for jpg and tar stacks
     // https://bugs.edge.launchpad.net/gnubook/+bug/323003
     // https://bugs.edge.launchpad.net/gnubook/+bug/385397
-    $imageFormatRegex = '@' . preg_quote($prefix, '@') . '_(jp2|tif)\.(zip|tar)$@';
+    $imageFormatRegex = '@' . preg_quote($prefix, '@') . '_(jp2|tif|jpg)\.(zip|tar)$@';
     
     $baseLength = strlen($item->metadataGrabber->mainDir . '/');
     foreach ($item->getFiles() as $location => $fileInfo) {