# HG changeset patch
# User hertzhaft
# Date 1332435112 -3600
# Node ID 81c2378f12ff0e28872a84f83afd23cd8a011fec
# Parent  59fa7b6ae9f79cfd0a1c7afbc3e1c587008ecbc3
put the child back into the bath :-)

diff -r 59fa7b6ae9f7 -r 81c2378f12ff common/src/main/java/digilib/image/ImageLoaderDocuImage.java
--- 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