Compare commits

..

No commits in common. "8e3a59929418c70b9b70164072d7d6eca55dae16" and "d6c0c9fd30ecf71563f146ebf369895a94fa627c" have entirely different histories.

2 changed files with 239 additions and 241 deletions

View File

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>jp.riken.neurodata.tools.BioFormatsImageInfo</groupId> <groupId>jp.riken.neurodata.tools.BioFormatsImageInfo</groupId>
<artifactId>bioformats-imageinfo</artifactId> <artifactId>bioformats-imageinfo</artifactId>
<version>1.1.0</version> <version>1.0.0</version>
<name>bioformats-imageinfo</name> <name>bioformats-imageinfo</name>
<url>https://neurodata.riken.jp</url> <url>https://neurodata.riken.jp</url>

View File

@ -68,8 +68,7 @@ public class BioFormatsImageInfo {
final byte[][] table8 = reader.get8BitLookupTable(); final byte[][] table8 = reader.get8BitLookupTable();
if (table8 != null) { if (table8 != null) {
indexed.add( indexed.add(
String.format("8-bit LUT: %d x %s", table8.length, String.format("8-bit LUT: %d x %s", table8.length, table8[0] == null ? "null" : "" + table8[0].length));
table8[0] == null ? "null" : "" + table8[0].length));
} }
final short[][] table16 = reader.get16BitLookupTable(); final short[][] table16 = reader.get16BitLookupTable();
if (table16 != null) { if (table16 != null) {
@ -83,8 +82,7 @@ public class BioFormatsImageInfo {
seriesMetadata.put("sizeY", reader.getSizeY()); seriesMetadata.put("sizeY", reader.getSizeY());
final int sizeZ = reader.getSizeZ(); final int sizeZ = reader.getSizeZ();
seriesMetadata.put("sizeZ", makeDimension(sizeZ, sizeZ, reader.getModuloZ())); seriesMetadata.put("sizeZ", makeDimension(sizeZ, sizeZ, reader.getModuloZ()));
seriesMetadata.put("sizeC", seriesMetadata.put("sizeC", makeDimension(reader.getSizeC(), reader.getEffectiveSizeC(), reader.getModuloC()));
makeDimension(reader.getSizeC(), reader.getEffectiveSizeC(), reader.getModuloC()));
final int sizeT = reader.getSizeT(); final int sizeT = reader.getSizeT();
seriesMetadata.put("sizeT", makeDimension(sizeT, sizeT, reader.getModuloT())); seriesMetadata.put("sizeT", makeDimension(sizeT, sizeT, reader.getModuloT()));
seriesMetadata.put("tileSize", makeRectangle(reader.getOptimalTileWidth(), reader.getOptimalTileHeight())); seriesMetadata.put("tileSize", makeRectangle(reader.getOptimalTileWidth(), reader.getOptimalTileHeight()));