Changeset 7448


Ignore:
Timestamp:
12/21/10 16:51:44 (9 years ago)
Author:
melissa
Message:

One more fix to 'uiSequenceCount' parsing.

This really definitely fixes #621.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/ND2Handler.java

    r7443 r7448  
    394394      int imageCount = Integer.parseInt(value); 
    395395      if (core.length > 0) imageCount /= core.length; 
    396       if (core[0].sizeZ * core[0].sizeT != core[0].imageCount && 
    397         core[0].sizeZ * core[0].sizeC * core[0].sizeT != core[0].imageCount) 
     396      if (core[0].sizeZ * core[0].sizeT != imageCount && 
     397        core[0].sizeZ * core[0].sizeC * core[0].sizeT != imageCount) 
    398398      { 
    399399        if (core[0].sizeZ > 1) { 
    400           core[0].sizeZ = core[0].imageCount; 
     400          core[0].sizeZ = imageCount; 
    401401          core[0].sizeT = 1; 
    402402        } 
    403403        else if (core[0].sizeT > 1) { 
    404           core[0].sizeT = core[0].imageCount; 
     404          core[0].sizeT = imageCount; 
    405405          core[0].sizeZ = 1; 
    406406        } 
     407        core[0].imageCount = imageCount; 
    407408      } 
    408409      metadata.put(qName, value); 
Note: See TracChangeset for help on using the changeset viewer.