Changeset 7350


Ignore:
Timestamp:
12/07/10 10:52:40 (9 years ago)
Author:
melissa
Message:
  • Reader wrapper implementations that manipulate byte arrays now declare their native data types to be byte[].
  • Fixed another bug in ChannelSeparator's cropped image handling.
Location:
trunk/components/bio-formats/src/loci/formats
Files:
4 edited

Legend:

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

    r6881 r7350  
    239239  // -- IFormatHandler API methods -- 
    240240 
     241  /* @see IFormatHandler#getNativeDataType() */ 
     242  public Class<?> getNativeDataType() { 
     243    return byte[].class; 
     244  } 
     245 
    241246  /* @see IFormatHandler#setId(String) */ 
    242247  @Override 
  • trunk/components/bio-formats/src/loci/formats/ChannelMerger.java

    r6881 r7350  
    162162  } 
    163163 
     164  // -- IFormatHandler API methods -- 
     165 
     166  /* @see IFormatHandler#getNativeDataType() */ 
     167  public Class<?> getNativeDataType() { 
     168    return byte[].class; 
     169  } 
     170 
    164171} 
  • trunk/components/bio-formats/src/loci/formats/ChannelSeparator.java

    r7318 r7350  
    170170        long availableMemory = rt.freeMemory(); 
    171171 
    172         if (availableMemory < FormatTools.getPlaneSize(reader)) { 
     172        if (availableMemory < w * h * bpp * c) { 
    173173          strips = (int) Math.sqrt(h); 
    174174        } 
     
    193193 
    194194          ImageTools.splitChannels(lastImage, strip, channel, c, bpp, 
    195             false, isInterleaved(), strip.length); 
     195            false, isInterleaved(), strips == 1 ? w * h * bpp : strip.length); 
    196196          if (strips != 1) { 
    197197            System.arraycopy(strip, 0, buf, i * stripHeight * w * bpp, 
     
    234234  // -- IFormatHandler API methods -- 
    235235 
     236  /* @see IFormatHandler#getNativeDataType() */ 
     237  public Class<?> getNativeDataType() { 
     238    return byte[].class; 
     239  } 
     240 
    236241  /* @see IFormatHandler#setId(String) */ 
    237242  public void setId(String id) throws FormatException, IOException { 
  • trunk/components/bio-formats/src/loci/formats/MinMaxCalculator.java

    r7309 r7350  
    274274      minMaxDone = null; 
    275275    } 
     276  } 
     277 
     278  // -- IFormatHandler API methods -- 
     279 
     280  /* @see IFormatHandler#getNativeDataType() */ 
     281  public Class<?> getNativeDataType() { 
     282    return byte[].class; 
    276283  } 
    277284 
Note: See TracChangeset for help on using the changeset viewer.