Mercurial > hg > digilib-old
changeset 1039:aef8a02e7ea5
fix for #21 extended to Windows
author | hertzhaft |
---|---|
date | Thu, 22 Mar 2012 15:39:25 +0100 |
parents | a79be2432eb4 |
children | 59fa7b6ae9f7 |
files | common/src/main/java/digilib/image/ImageLoaderDocuImage.java webapp/src/main/webapp/jquery/jquery.digilib.sliders.js |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/src/main/java/digilib/image/ImageLoaderDocuImage.java Mon Mar 19 17:39:35 2012 +0100 +++ b/common/src/main/java/digilib/image/ImageLoaderDocuImage.java Thu Mar 22 15:39:25 2012 +0100 @@ -65,8 +65,8 @@ public class ImageLoaderDocuImage extends ImageInfoDocuImage { /** DocuImage version */ - public static final String version = "ImageLoaderDocuImage 2.1.3"; - + public static final String version = "ImageLoaderDocuImage 2.1.4"; + /** image object */ protected BufferedImage img; @@ -138,7 +138,9 @@ String os = System.getProperty("os.name"); String osver = System.getProperty("os.version"); logger.debug("os="+os+" ver="+osver+" java_version="+ver); - if ((os.startsWith("Linux")) || (os.startsWith("Mac OS X") && osver.startsWith("10.7"))) { + 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 });
--- a/webapp/src/main/webapp/jquery/jquery.digilib.sliders.js Mon Mar 19 17:39:35 2012 +0100 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.sliders.js Thu Mar 22 15:39:25 2012 +0100 @@ -180,6 +180,7 @@ $slider.remove(); }); $slider.fadeIn(); + // $range.range('set', brgt); fn.centerOnScreen(data, $slider); } };