Index: ChannelFiller.java =================================================================== --- ChannelFiller.java (revision 3935) +++ ChannelFiller.java (working copy) @@ -152,8 +152,8 @@ } } else { - int pt = 0; for (int i=0; i> 8)); Index: meta/FilterMetadata.java =================================================================== --- meta/FilterMetadata.java (revision 3935) +++ meta/FilterMetadata.java (working copy) @@ -756,4 +756,10 @@ delegate.setExperimenterDataDirectory(temp, experimenterIndex); } +public void setChannelGlobalMinMax(int channel, Double globalMin, + Double globalMax, Integer i) +{ + delegate.setChannelGlobalMinMax(channel, globalMin, globalMax, i); } + +} Index: meta/DummyMetadata.java =================================================================== --- meta/DummyMetadata.java (revision 3935) +++ meta/DummyMetadata.java (working copy) @@ -1311,4 +1311,9 @@ public void setExperimenterDataDirectory(String dataDirectory, int experimenterIndex) { } + public void setChannelGlobalMinMax(int channel, Double globalMin, + Double globalMax, Integer i) + { + } + } Index: meta/MetadataStore.java =================================================================== --- meta/MetadataStore.java (revision 3935) +++ meta/MetadataStore.java (working copy) @@ -1026,4 +1026,19 @@ */ void setExperimenterDataDirectory(String dataDirectory, int experimenterIndex); + /** + * Sets a channel's global min and global max in the metadata store for a + * particular pixels set. + * + * NOTE: The implementation of this method is optional and can be purely a + * no-op. It is here to ensure compatability with certain stores which require + * this data to be specified explicitly. + * + * @param channel the index of the channel within the pixels set. + * @param globalMin the global minimum pixel value for the channel. + * @param globalMax the global maximum pixel value for the channel. + * @param i the index of the pixels set within the metadata store. + */ + void setChannelGlobalMinMax(int channel, Double globalMin, + Double globalMax, Integer i); } Index: readers.txt =================================================================== --- readers.txt (revision 3935) +++ readers.txt (working copy) @@ -29,37 +29,37 @@ loci.formats.in.JPEGReader # jpg, jpeg [javax.imageio] # standalone readers with unique file extensions -loci.formats.in.PGMReader # pgm -loci.formats.in.FitsReader # fits +#loci.formats.in.PGMReader # pgm +#loci.formats.in.FitsReader # fits loci.formats.in.PCXReader # pcx loci.formats.in.GIFReader # gif loci.formats.in.BMPReader # bmp loci.formats.in.DicomReader # dcm, dicom -loci.formats.in.IPLabReader # ipl +#loci.formats.in.IPLabReader # ipl loci.formats.in.DeltavisionReader # dv, r3d -loci.formats.in.MRCReader # mrc -loci.formats.in.GatanReader # dm3 +#loci.formats.in.MRCReader # mrc +#loci.formats.in.GatanReader # dm3 loci.formats.in.ImarisReader # ims loci.formats.in.OpenlabRawReader # raw -loci.formats.in.OMEXMLReader # ome +#loci.formats.in.OMEXMLReader # ome loci.formats.in.LIFReader # lif -loci.formats.in.AVIReader # avi -loci.formats.in.QTReader # mov +#loci.formats.in.AVIReader # avi +#loci.formats.in.QTReader # mov loci.formats.in.PictReader # pict, pct -loci.formats.in.SDTReader # sdt -loci.formats.in.EPSReader # eps, epsi -loci.formats.in.SlidebookReader # sld -loci.formats.in.AliconaReader # al3d -loci.formats.in.MNGReader # mng -loci.formats.in.KhorosReader # xv +#loci.formats.in.SDTReader # sdt +#loci.formats.in.EPSReader # eps, epsi +#loci.formats.in.SlidebookReader # sld +#loci.formats.in.AliconaReader # al3d +#loci.formats.in.MNGReader # mng +#loci.formats.in.KhorosReader # xv loci.formats.in.VisitechReader # html, xys -loci.formats.in.LIMReader # lim -loci.formats.in.PSDReader # psd -loci.formats.in.InCellReader # xdce -loci.formats.in.L2DReader # l2d +#loci.formats.in.LIMReader # lim +#loci.formats.in.PSDReader # psd +#loci.formats.in.InCellReader # xdce +#loci.formats.in.L2DReader # l2d # multi-extension messes -loci.formats.in.NRRDReader # nrrd, nhdr, pic +#loci.formats.in.NRRDReader # nrrd, nhdr, pic loci.formats.in.ICSReader # ics, ids loci.formats.in.PerkinElmerReader # rec, ano, csv, htm, tim, zpo, 2, 3, ... loci.formats.in.TCSReader # xml, tif @@ -70,29 +70,29 @@ # readers requiring third-party libraries loci.formats.in.FV1000Reader # oib, oif, various loci.formats.in.ZeissZVIReader # zvi [POIFS] -loci.formats.in.IPWReader # ipw [POIFS] +#loci.formats.in.IPWReader # ipw [POIFS] loci.formats.in.ND2Reader # nd2, jp2 [JAI-ImageIO] -loci.formats.in.PCIReader # cxd [POIFS] +#loci.formats.in.PCIReader # cxd [POIFS] loci.formats.in.ImarisHDFReader # ims # TIFF-based readers with unique file extensions loci.formats.in.MetamorphReader # stk loci.formats.in.ZeissLSMReader # lsm -loci.formats.in.SEQReader # seq -loci.formats.in.GelReader # gel +#loci.formats.in.SEQReader # seq +#loci.formats.in.GelReader # gel loci.formats.in.ImarisTiffReader # ims -loci.formats.in.FlexReader # flex -loci.formats.in.SVSReader # svs +#loci.formats.in.FlexReader # flex +#loci.formats.in.SVSReader # svs # TIFF-based readers with slow isThisType loci.formats.in.LeicaReader # lei, tif -loci.formats.in.NikonReader # nef, tif -loci.formats.in.FluoviewReader # tif -loci.formats.in.PrairieReader # xml, cfg, tif -loci.formats.in.MicromanagerReader # txt, tif +#loci.formats.in.NikonReader # nef, tif +#loci.formats.in.FluoviewReader # tif +#loci.formats.in.PrairieReader # xml, cfg, tif +#loci.formats.in.MicromanagerReader # txt, tif loci.formats.in.ImprovisionTiffReader # tif loci.formats.in.MetamorphTiffReader # tif -loci.formats.in.OMETiffReader # tif +#loci.formats.in.OMETiffReader # tif # standard TIFF reader must go last (it accepts any TIFF) loci.formats.in.TiffReader # tif, tiff Index: MinMaxCalculator.java =================================================================== --- MinMaxCalculator.java (revision 3935) +++ MinMaxCalculator.java (working copy) @@ -25,6 +25,7 @@ package loci.formats; import java.awt.image.*; +import java.io.FileOutputStream; import java.io.IOException; import java.util.*; import loci.formats.meta.MetadataStore; @@ -231,6 +232,9 @@ FormatTools.assertId(getCurrentFile(), true, 2); super.openBytes(no, buf, x, y, w, h); updateMinMax(buf, no); + //FileOutputStream f = new FileOutputStream("out.buf", true); + //f.write(buf); + //f.close(); return buf; } @@ -309,8 +313,8 @@ MetadataStore store = getMetadataStore(); for (int c=0; c