Changeset 3233


Ignore:
Timestamp:
10/05/07 14:55:11 (12 years ago)
Author:
curtis
Message:

Fix bug with scramble feature.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/utils/MakeTestOmeTiff.java

    r3232 r3233  
    4545  /** 
    4646   * Constructs a TiffData element matching the given parameters. 
    47    * @param ifd Value to use for IFD attribute, or -1 for none. 
     47   * @param ifd Value to use for IFD attribute; 0 is default/none. 
    4848   * @param num Value to use for NumPlanes attribute, or -1 for none. 
    49    * @param firstZ Value to use for FirstZ attribute, or null for none. 
    50    * @param firstC Value to use for FirstC attribute, or null for none. 
    51    * @param firstT Value to use for FirstT attribute, or null for none. 
     49   * @param firstZ Value to use for FirstZ attribute; 0 is default/none. 
     50   * @param firstC Value to use for FirstC attribute; 0 is default/none. 
     51   * @param firstT Value to use for FirstT attribute; 0 is default/none. 
    5252   * @param order Dimension order; only used when scrambling. 
    5353   * @param sizeZ Number of focal planes; only used when scrambling. 
     
    491491                  // current Pixels is not part of this file 
    492492                  xml = xml.replaceFirst(pattern, 
    493                     tiffData(-1, 0, -1, -1, -1, dimOrder[ii][pp], 
     493                    tiffData(0, 0, 0, 0, 0, dimOrder[ii][pp], 
    494494                    sizeZ[ii][pp], sizeC[ii][pp], sizeT[ii][pp], total)); 
    495495                  continue; 
     
    508508                  if ((!allI || numImages == 1) && numPixels[i] == 1) { 
    509509                    // only one Pixels in this file; don't need IFD/NumPlanes 
    510                     ifd = num = -1; 
     510                    ifd = 0; 
     511                    num = -1; 
    511512                  } 
    512513                  xml = xml.replaceFirst(pattern, 
    513                     tiffData(ifd, num, -1, -1, -1, dimOrder[ii][pp], 
     514                    tiffData(ifd, num, 0, 0, 0, dimOrder[ii][pp], 
    514515                    sizeZ[ii][pp], sizeC[ii][pp], sizeT[ii][pp], total)); 
    515516                } 
    516517                else { // pp == p 
    517518                  xml = xml.replaceFirst(pattern, 
    518                     tiffData(-1, -1, fz, fc, ft, dimOrder[ii][pp], 
     519                    tiffData(0, -1, fz, fc, ft, dimOrder[ii][pp], 
    519520                    sizeZ[ii][pp], sizeC[ii][pp], sizeT[ii][pp], total)); 
    520521                } 
Note: See TracChangeset for help on using the changeset viewer.