From 1f3845c9dbf9b36c3aece5340a9f4ec9a4b3fd4f Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 26 Apr 2011 10:49:55 +0000
Subject: [PATCH] Workaround to fix compilation problem in screening project
SVN: 21037
---
.../openbis/dss/generic/shared/utils/ImageUtil.java | 6 ++++++
.../dss/generic/shared/utils/ImageUtilTest.java | 10 ++++++++++
2 files changed, 16 insertions(+)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
index 83ba397171b..3f148f06b4b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtil.java
@@ -203,6 +203,12 @@ public class ImageUtil
return loadImage(content, 0);
}
+ public static BufferedImage loadImage(IContent content, Integer pageOrNull,
+ String imageLibraryNameOrNull, String imageLibraryReaderNameOrNull)
+ {
+ return loadImage(content, pageOrNull);
+ }
+
/**
* Loads the specified <var>page</var> from the image from the tiven </var>inputStream</var>.
* Supported images formats are GIF, JPG, PNG, and TIFF. The input stream will be closed after
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java
index c4c857c1ba5..f133227f1f6 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/ImageUtilTest.java
@@ -164,4 +164,14 @@ public class ImageUtilTest extends AssertJUnit
assertEquals(expectedWith, image.getWidth());
assertEquals(expectedHeight, image.getHeight());
}
+
+ public static BufferedImage loadImage(File content)
+ {
+ return ImageUtil.loadImage(content);
+ }
+
+ public static BufferedImage loadImage(IContent content)
+ {
+ return ImageUtil.loadImage(content);
+ }
}
--
GitLab