Changeset 3149 for trunk


Ignore:
Timestamp:
09/10/07 09:11:13 (13 years ago)
Author:
melissa
Message:

Fixed bug with Venu's JP2 file; removed temporary comments from testing framework.

Location:
trunk/loci/formats
Files:
3 edited

Legend:

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

    r3113 r3149  
    184184 
    185185    if (isJPEG) { 
    186       byte[][] pixels = ImageTools.getPixelBytes(openImage(no), false); 
    187  
     186      BufferedImage b = openImage(no); 
     187      byte[][] pixels = ImageTools.getPixelBytes(b, false); 
     188      if (pixels.length == 1 && core.sizeC[0] > 1) { 
     189        pixels = ImageTools.splitChannels(pixels[0], core.sizeC[0],  
     190          FormatTools.getBytesPerPixel(core.pixelType[0]), false,  
     191          !core.interleaved[0]); 
     192      } 
    188193      for (int i=0; i<core.sizeC[0]; i++) { 
    189194        System.arraycopy(pixels[i], 0, buf, i*pixels[i].length, 
  • trunk/loci/formats/test/ReaderTest.java

    r3108 r3149  
    379379        boolean failInt = config.isInterleaved(file) != r.isInterleaved(); 
    380380        boolean failRGB = config.isRGB(file) != r.isRGB(); 
    381         // TODO : uncomment this once the config files have been updated 
    382         //boolean failTX = config.getThumbX(file) != r.getThumbSizeX(); 
    383         //boolean failTY = config.getThumbY(file) != r.getThumbSizeY(); 
     381        boolean failTX = config.getThumbX(file) != r.getThumbSizeX(); 
     382        boolean failTY = config.getThumbY(file) != r.getThumbSizeY(); 
    384383        boolean failType = config.getPixelType(file) != r.getPixelType(); 
    385384        boolean failEndian = config.isLittleEndian(file) != r.isLittleEndian(); 
    386385 
    387386        success = !(failX || failY || failZ || failC || failT || failDim || 
    388           failInt || failRGB || /*failTX || failTY || */failType || failEndian); 
     387          failInt || failRGB || failTX || failTY || failType || failEndian); 
    389388 
    390389        if (!success) { 
  • trunk/loci/formats/test/package.html

    r1948 r3149  
    11<html><body> 
    2 Package that provides automated testing of the Bio-Formats library using JUnit. 
     2Package that provides automated testing of the Bio-Formats library using TestNG. 
    33</body></html> 
Note: See TracChangeset for help on using the changeset viewer.