Mercurial > hg > digilib-old

changeset 1041:81c2378f12ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
put the child back into the bath :-)
author hertzhaft
date Thu, 22 Mar 2012 17:51:52 +0100
parents 59fa7b6ae9f7
children 2c5a48a624c5
files common/src/main/java/digilib/image/ImageLoaderDocuImage.java
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/src/main/java/digilib/image/ImageLoaderDocuImage.java	Thu Mar 22 16:38:32 2012 +0100
+++ b/common/src/main/java/digilib/image/ImageLoaderDocuImage.java	Thu Mar 22 17:51:52 2012 +0100
@@ -65,7 +65,7 @@
 public class ImageLoaderDocuImage extends ImageInfoDocuImage {
 
     /** DocuImage version */
-    public static final String version = "ImageLoaderDocuImage 2.1.4";
+    public static final String version = "ImageLoaderDocuImage 2.1.4b";
 
     /** image object */
     protected BufferedImage img;
@@ -139,14 +139,14 @@
         String osver = System.getProperty("os.version");
         logger.debug("os="+os+" ver="+osver+" java_version="+ver);
         if ((os.startsWith("Linux"))
-            || (os.startsWith("Windows"))
             || (os.startsWith("Mac OS X") && osver.startsWith("10.7"))) {
             // GRAB(WTF?) works for Linux JDK1.6 with transparency
             needsInvertRgba = true;
             invertRgbaByteTable = new ByteLookupTable(0, new byte[][] { invertByte, invertByte, orderedByte, invertByte });
             needsRescaleRgba = true;
             needsMapBgr = true;
-        } else if (os.startsWith("Mac OS X") && osver.startsWith("10.6")) {
+        } else if ((os.startsWith("Mac OS X") && osver.startsWith("10.6")) 
+            || (os.startsWith("Windows"))) {
             needsRescaleRgba = true;
         }
         // this hopefully works for all