Changeset 1878


Ignore:
Timestamp:
11/30/06 07:57:40 (13 years ago)
Author:
melissa
Message:

Fixed how importer handles floating point ICS files.

Location:
trunk/loci
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/ICSReader.java

    r1876 r1878  
    116116  public boolean isInterleaved(String id) throws FormatException, IOException { 
    117117    if (!id.equals(currentIdsId) && !id.equals(currentIcsId)) initFile(id); 
    118     return rgb; 
     118    return !rgb; 
    119119  } 
    120120 
     
    176176 
    177177    return ImageTools.makeImage(plane, width, height, channels, true, 
    178       bytes, !littleEndian); 
     178      bytes, littleEndian); 
    179179  } 
    180180 
     
    386386    String sign = (String) metadata.get("sign"); 
    387387 
     388    if (bitsPerPixel < 32) littleEndian = !littleEndian; 
     389 
    388390    if (fmt.equals("real")) pixelType[0] = FormatReader.FLOAT; 
    389391    else if (fmt.equals("integer")) { 
  • trunk/loci/plugins/Importer.java

    r1877 r1878  
    585585              if (stackO == null) stackO = new ImageStack(w, h); 
    586586              float[][] pix = new float[c][w*h]; 
    587               if (r.isInterleaved(id)) { 
     587              if (!r.isInterleaved(id)) { 
    588588                for (int k=0; k<f.length; k+=c) { 
    589589                  for (int l=0; l<c; l++) { 
Note: See TracChangeset for help on using the changeset viewer.