diff --git a/components/scifio/build.properties b/components/scifio/build.properties
index 734f47b981e..52371211ca5 100644
--- a/components/scifio/build.properties
+++ b/components/scifio/build.properties
@@ -8,13 +8,15 @@
component.name = scifio
component.jar = scifio.jar
-component.version = 4.3-DEV
+component.version = 4.4-DEV
component.classpath = ${artifact.dir}/jai_imageio.jar:\
${artifact.dir}/loci-common.jar:\
${artifact.dir}/lwf-stubs.jar:\
${artifact.dir}/ome-xml.jar:\
${lib.dir}/forms-1.3.0.jar:\
+ ${lib.dir}/imglib2.jar:\
${lib.dir}/log4j-1.2.15.jar:\
+ ${lib.dir}/retrotranslator-runtime-1.2.9.jar:\
${lib.dir}/slf4j-api-1.5.10.jar:\
${lib.dir}/testng-5.11-jdk15.jar:\
${lib.dir}/JimiProClasses.jar
@@ -39,8 +41,9 @@ component.cp.no-xml = ${artifact.dir}/jai_imageio.jar:\
${artifact.dir}/mdbtools-java.jar:\
${artifact.dir}/poi-loci.jar:\
${lib.dir}/forms-1.3.0.jar:\
+ ${lib.dir}/imglib2.jar:\
${lib.dir}/log4j-1.2.15.jar:\
- ${lib.dir}/netcdf-4.0.jar:\
+ ${lib.dir}/retrotranslator-runtime-1.2.9.jar:\
${lib.dir}/slf4j-api-1.5.10.jar:\
${lib.dir}/testng-5.11-jdk15.jar
@@ -50,9 +53,10 @@ component.cp.no-jai = ${artifact.dir}/loci-common.jar:\
${artifact.dir}/ome-xml.jar:\
${artifact.dir}/poi-loci.jar:\
${lib.dir}/forms-1.3.0.jar:\
+ ${lib.dir}/imglib2.jar:\
${lib.dir}/log4j-1.2.15.jar:\
+ ${lib.dir}/retrotranslator-runtime-1.2.9.jar:\
${lib.dir}/slf4j-api-1.5.10.jar:\
- ${lib.dir}/slf4j-log4j12-1.5.10.jar:\
${lib.dir}/testng-5.11-jdk15.jar
# Used by TestNG suite that tests the absence of class from stubs.jar
@@ -61,7 +65,8 @@ component.cp.no-lurawave = ${artifact.dir}/loci-common.jar:\
${artifact.dir}/ome-xml.jar:\
${artifact.dir}/poi-loci.jar:\
${lib.dir}/forms-1.3.0.jar:\
+ ${lib.dir}/imglib2.jar:\
${lib.dir}/log4j-1.2.15.jar:\
+ ${lib.dir}/retrotranslator-runtime-1.2.9.jar:\
${lib.dir}/slf4j-api-1.5.10.jar:\
- ${lib.dir}/slf4j-log4j12-1.5.10.jar:\
${lib.dir}/testng-5.11-jdk15.jar
diff --git a/components/scifio/pom.xml b/components/scifio/pom.xml
index bf0e770b417..503bc1ba3af 100644
--- a/components/scifio/pom.xml
+++ b/components/scifio/pom.xml
@@ -58,7 +58,7 @@
net.imglib2
imglib2
- 2.0-SNAPSHOT
+ 20120321
org.slf4j
diff --git a/components/scifio/src/ome/scifio/img/ImgIOUtils.java b/components/scifio/src/ome/scifio/img/ImgIOUtils.java
index e1b60e3cf91..155561f2002 100644
--- a/components/scifio/src/ome/scifio/img/ImgIOUtils.java
+++ b/components/scifio/src/ome/scifio/img/ImgIOUtils.java
@@ -181,7 +181,7 @@ public static > T makeType(final int pixelType) {
}
/** Converts ImgLib2 Type object to SCIFIO pixel type. */
- public static > int makeType(final T type) {
+ public static int makeType(final RealType> type) {
int pixelType = FormatTools.UINT8;
if(type instanceof UnsignedByteType) {
pixelType = FormatTools.UINT8;
diff --git a/jar/imglib2.jar b/jar/imglib2.jar
new file mode 100644
index 00000000000..2092b6e6919
Binary files /dev/null and b/jar/imglib2.jar differ
diff --git a/jar/retrotranslator-runtime-1.2.9.jar b/jar/retrotranslator-runtime-1.2.9.jar
new file mode 100644
index 00000000000..dc1f6940bce
Binary files /dev/null and b/jar/retrotranslator-runtime-1.2.9.jar differ