Changeset 7063


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

Prevent Bio-Rad reader from attempting to initialize ._*.pic files. See  omero:#3039.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/BioRadReader.java

    r7007 r7063  
    188188    Location thisFile = new Location(id).getAbsoluteFile(); 
    189189    Location parent = thisFile.getParentFile(); 
    190     String[] list = parent.list(); 
     190    String[] list = parent.list(true); 
    191191    for (String f : list) { 
    192192      if (checkSuffix(f, "raw") || checkSuffix(f, "xml")) { 
     
    264264      Location dir = new Location(id).getAbsoluteFile().getParentFile(); 
    265265 
    266       String[] list = dir.list(); 
     266      String[] list = dir.list(true); 
    267267      for (int i=0; i<list.length; i++) { 
    268268        if (checkSuffix(list[i], PIC_SUFFIX)) { 
     
    278278    in = new RandomAccessInputStream(id); 
    279279    in.order(true); 
     280 
     281    /* debug */ System.out.println("initializing .pic file: " + id); 
    280282 
    281283    offset = new Vector<Double>(); 
  • trunk/components/bio-formats/src/loci/formats/in/BioRadReader.java

    r6881 r7063  
    188188    Location thisFile = new Location(id).getAbsoluteFile(); 
    189189    Location parent = thisFile.getParentFile(); 
    190     String[] list = parent.list(); 
     190    String[] list = parent.list(true); 
    191191    for (String f : list) { 
    192192      if (checkSuffix(f, "raw") || checkSuffix(f, "xml")) { 
     
    264264      Location dir = new Location(id).getAbsoluteFile().getParentFile(); 
    265265 
    266       String[] list = dir.list(); 
     266      String[] list = dir.list(true); 
    267267      for (int i=0; i<list.length; i++) { 
    268268        if (checkSuffix(list[i], PIC_SUFFIX)) { 
     
    278278    in = new RandomAccessInputStream(id); 
    279279    in.order(true); 
     280 
     281    /* debug */ System.out.println("initializing .pic file: " + id); 
    280282 
    281283    offset = new Vector<Double>(); 
Note: See TracChangeset for help on using the changeset viewer.