Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build fixes for the imglib2 dependency #45

Merged
merged 4 commits into from Mar 23, 2012
Merged

Build fixes for the imglib2 dependency #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f32906d
Fix SCIFIO component version
ctrueden Mar 22, 2012
a1be6fb
Add imglib2.jar to Ant build system
ctrueden Mar 22, 2012
12e916e
Use non-generic parameter to avoid compile error
ctrueden Mar 22, 2012
57fc9ad
Fix version of imglib2 to a specific release
ctrueden Mar 22, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 9 additions & 4 deletions components/scifio/build.properties
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion components/scifio/pom.xml
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>net.imglib2</groupId>
<artifactId>imglib2</artifactId>
<version>2.0-SNAPSHOT</version>
<version>20120321</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion components/scifio/src/ome/scifio/img/ImgIOUtils.java
View file
Open in desktop
Expand Up @@ -181,7 +181,7 @@ public static <T extends RealType<T>> T makeType(final int pixelType) {
}

/** Converts ImgLib2 Type object to SCIFIO pixel type. */
public static <T extends RealType<T>> int makeType(final T type) {
public static int makeType(final RealType<?> type) {
int pixelType = FormatTools.UINT8;
if(type instanceof UnsignedByteType) {
pixelType = FormatTools.UINT8;
Expand Down
Binary file added jar/imglib2.jar
View file
Open in desktop
Binary file not shown.
Binary file added jar/retrotranslator-runtime-1.2.9.jar
View file
Open in desktop
Binary file not shown.