Mercurial > hg > digilib-old
comparison common/src/main/java/digilib/image/ImageLoaderDocuImage.java @ 1039:aef8a02e7ea5
fix for #21 extended to Windows
author | hertzhaft |
---|---|
date | Thu, 22 Mar 2012 15:39:25 +0100 |
parents | e4eb1209fa78 |
children | 81c2378f12ff |
comparison
equal
deleted
inserted
replaced
1038:a79be2432eb4 | 1039:aef8a02e7ea5 |
---|---|
63 * Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. | 63 * Implementation of DocuImage using the ImageLoader API of Java 1.4 and Java2D. |
64 */ | 64 */ |
65 public class ImageLoaderDocuImage extends ImageInfoDocuImage { | 65 public class ImageLoaderDocuImage extends ImageInfoDocuImage { |
66 | 66 |
67 /** DocuImage version */ | 67 /** DocuImage version */ |
68 public static final String version = "ImageLoaderDocuImage 2.1.3"; | 68 public static final String version = "ImageLoaderDocuImage 2.1.4"; |
69 | 69 |
70 /** image object */ | 70 /** image object */ |
71 protected BufferedImage img; | 71 protected BufferedImage img; |
72 | 72 |
73 /** the reader object */ | 73 /** the reader object */ |
74 protected ImageReader reader = null; | 74 protected ImageReader reader = null; |
136 // but doesn't work with alpha channel on all platforms | 136 // but doesn't work with alpha channel on all platforms |
137 String ver = System.getProperty("java.version"); | 137 String ver = System.getProperty("java.version"); |
138 String os = System.getProperty("os.name"); | 138 String os = System.getProperty("os.name"); |
139 String osver = System.getProperty("os.version"); | 139 String osver = System.getProperty("os.version"); |
140 logger.debug("os="+os+" ver="+osver+" java_version="+ver); | 140 logger.debug("os="+os+" ver="+osver+" java_version="+ver); |
141 if ((os.startsWith("Linux")) || (os.startsWith("Mac OS X") && osver.startsWith("10.7"))) { | 141 if ((os.startsWith("Linux")) |
142 || (os.startsWith("Windows")) | |
143 || (os.startsWith("Mac OS X") && osver.startsWith("10.7"))) { | |
142 // GRAB(WTF?) works for Linux JDK1.6 with transparency | 144 // GRAB(WTF?) works for Linux JDK1.6 with transparency |
143 needsInvertRgba = true; | 145 needsInvertRgba = true; |
144 invertRgbaByteTable = new ByteLookupTable(0, new byte[][] { invertByte, invertByte, orderedByte, invertByte }); | 146 invertRgbaByteTable = new ByteLookupTable(0, new byte[][] { invertByte, invertByte, orderedByte, invertByte }); |
145 needsRescaleRgba = true; | 147 needsRescaleRgba = true; |
146 needsMapBgr = true; | 148 needsMapBgr = true; |