Changeset 3954


Ignore:
Timestamp:
04/18/08 14:55:37 (12 years ago)
Author:
melissa
Message:

Treat XZ and XT scans like regular XY images.

File:
1 edited

Legend:

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

    r3949 r3954  
    177177    FormatTools.checkBufferSize(this, buf.length, w, h); 
    178178 
    179     if (core.sizeY[0] > 1) { 
    180       // check that predictor is set to 1 if anything other 
    181       // than LZW compression is used 
    182       if (TiffTools.getCompression(ifds[no]) != TiffTools.LZW) { 
    183         ifds[no].put(new Integer(TiffTools.PREDICTOR), new Integer(1)); 
    184       } 
    185  
    186       TiffTools.getSamples(ifds[no], in, buf, x, y, w, h); 
    187     } 
    188     else { 
    189       if (TiffTools.getCompression(ifds[0]) != TiffTools.LZW) { 
    190         ifds[0].put(new Integer(TiffTools.PREDICTOR), new Integer(1)); 
    191       } 
    192  
    193       TiffTools.getSamples(ifds[0], in, buf, x, no, w, 1); 
    194     } 
     179    // check that predictor is set to 1 if anything other 
     180    // than LZW compression is used 
     181    if (TiffTools.getCompression(ifds[no]) != TiffTools.LZW) { 
     182      ifds[no].put(new Integer(TiffTools.PREDICTOR), new Integer(1)); 
     183    } 
     184 
     185    TiffTools.getSamples(ifds[no], in, buf, x, y, w, h); 
    195186    return buf; 
    196187  } 
     
    567558                case SUBBLOCK_END: 
    568559                  count = 1; 
    569                   prefix.pop(); 
     560                  if (prefix.size() > 0) prefix.pop(); 
    570561                  if (prefix.size() == 0) done = true; 
    571562                  break; 
     
    776767    initMetadata(); 
    777768 
    778     if (ifds.length == 1 && core.imageCount[0] > ifds.length) { 
    779       core.sizeY[0] = 1; 
    780     } 
    781     else if (core.imageCount[0] != ifds.length) { 
     769    if (core.imageCount[0] != ifds.length) { 
    782770      int diff = core.imageCount[0] - ifds.length; 
    783771      core.imageCount[0] = ifds.length; 
Note: See TracChangeset for help on using the changeset viewer.