Changeset 3268


Ignore:
Timestamp:
10/11/07 14:32:43 (12 years ago)
Author:
melissa
Message:

Removed several hacks that added an extra blank channel if C == 2.

Location:
trunk/loci/formats
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/ImageTools.java

    r3267 r3268  
    983983    } 
    984984    if (c < 1 || c > 4) return null; 
    985     if (c == 2) c = 3; // blank B channel 
    986985 
    987986    // compile results into a single array 
  • trunk/loci/formats/TiffTools.java

    r3264 r3268  
    14621462    } 
    14631463 
    1464     if (samples.length == 2) { 
    1465       byte[][] s = new byte[3][samples[0].length]; 
    1466       System.arraycopy(samples[0], 0, s[0], 0, s[0].length); 
    1467       System.arraycopy(samples[1], 0, s[1], 0, s[1].length); 
    1468       samples = s; 
    1469     } 
    14701464    return ImageTools.makeImage(samples, (int) imageWidth, (int) imageLength); 
    14711465  } 
  • trunk/loci/formats/in/EPSReader.java

    r3204 r3268  
    168168      core.sizeT[0] = 1; 
    169169      core.sizeC[0] = TiffTools.getSamplesPerPixel(ifds[0]); 
    170       if (core.sizeC[0] == 2) core.sizeC[0] = 3; 
    171170      core.littleEndian[0] = TiffTools.isLittleEndian(ifds[0]); 
    172171      core.interleaved[0] = true; 
  • trunk/loci/formats/in/ND2Reader.java

    r3204 r3268  
    636636    } 
    637637 
    638     if (core.sizeC[0] == 2) core.sizeC[0] = 1; 
    639  
    640638    core.currentOrder[0] = "XY"; 
    641639    long deltaT = ts.size() > 1 ? 
Note: See TracChangeset for help on using the changeset viewer.