Warning: Can't synchronize with repository "(default)" (/home/git/ome.git does not appear to be a Git repository.). Look in the Trac log for more information.
Ticket #12121: 0001-specification-Add-SubChannelInterleaving-enum.patch
File 0001-specification-Add-SubChannelInterleaving-enum.patch,
3.6 KB
(added by rleigh, 10 years ago) |
|
-
From ce36bab11df77329d2621f408c9b72a674a0a364 Mon Sep 17 00:00:00 2001
From: Roger Leigh <r.leigh@dundee.ac.uk>
Date: Fri, 18 Apr 2014 15:26:25 +0100
Subject: [PATCH 1/7] specification: Add SubChannelInterleaving enum
---
components/formats-api/src/loci/formats/MetadataTools.java | 3 ++-
.../src/loci/formats/meta/MetadataConverter.java | 4 ++--
.../specification/released-schema/2013-10-dev-2/ome.xsd | 14 ++++++++++----
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/components/formats-api/src/loci/formats/MetadataTools.java b/components/formats-api/src/loci/formats/MetadataTools.java
index ea8d058..d5be396 100644
a
|
b
|
import ome.xml.model.BinData; |
56 | 56 | import ome.xml.model.enums.DimensionOrder; |
57 | 57 | import ome.xml.model.enums.EnumerationException; |
58 | 58 | import ome.xml.model.enums.PixelType; |
| 59 | import ome.xml.model.enums.SubChannelInterleaving; |
59 | 60 | import ome.xml.model.primitives.NonNegativeInteger; |
60 | 61 | import ome.xml.model.primitives.NonNegativeLong; |
61 | 62 | import ome.xml.model.primitives.PositiveInteger; |
… |
… |
public final class MetadataTools { |
140 | 141 | r.getSizeY(), r.getSizeZ(), r.getSizeC(), r.getSizeT(), |
141 | 142 | r.getRGBChannelCount()); |
142 | 143 | |
143 | | store.setPixelsInterleaved(r.isInterleaved(), i); |
| 144 | store.setPixelsSubChannelInterleaving(r.isInterleaved() ? SubChannelInterleaving.CHUNKY : SubChannelInterleaving.PLANAR, i); |
144 | 145 | store.setPixelsSignificantBits( |
145 | 146 | new PositiveInteger(r.getBitsPerPixel()), i); |
146 | 147 | |
-
diff --git a/components/formats-api/src/loci/formats/meta/MetadataConverter.java b/components/formats-api/src/loci/formats/meta/MetadataConverter.java
index 242f7c7..6ef1c38 100644
a
|
b
|
public final class MetadataConverter { |
864 | 864 | catch (NullPointerException e) { } |
865 | 865 | |
866 | 866 | try { |
867 | | Boolean interleaved = src.getPixelsInterleaved(i); |
868 | | dest.setPixelsInterleaved(interleaved, i); |
| 867 | SubChannelInterleaving interleaving = src.getPixelsSubChannelInterleaving(i); |
| 868 | dest.setPixelsSubChannelInterleaving(interleaving, i); |
869 | 869 | } |
870 | 870 | catch (NullPointerException e) { } |
871 | 871 | |
-
diff --git a/components/specification/released-schema/2013-10-dev-2/ome.xsd b/components/specification/released-schema/2013-10-dev-2/ome.xsd
index 9a6a294..2ccb091 100644
a
|
b
|
|
401 | 401 | </xsd:documentation> |
402 | 402 | </xsd:annotation> |
403 | 403 | </xsd:attribute> |
404 | | <xsd:attribute name="Interleaved" use="optional" type="xsd:boolean"> |
| 404 | <xsd:attribute name="SubChannelInterleaving" use="optional"> |
405 | 405 | <xsd:annotation> |
406 | 406 | <xsd:documentation> |
407 | | How the channels are arranged within the data block: |
408 | | true if channels are stored RGBRGBRGB...; |
409 | | false if channels are stored RRR...GGG...BBB... |
| 407 | How sub-channels are arranged within the data block: |
| 408 | Chunky if channels are stored RGBRGBRGB...; |
| 409 | Planar if channels are stored RRR...GGG...BBB... |
410 | 410 | </xsd:documentation> |
411 | 411 | </xsd:annotation> |
| 412 | <xsd:simpleType> |
| 413 | <xsd:restriction base="xsd:string"> |
| 414 | <xsd:enumeration value="Chunky"/> |
| 415 | <xsd:enumeration value="Planar"/> |
| 416 | </xsd:restriction> |
| 417 | </xsd:simpleType> |
412 | 418 | </xsd:attribute> |
413 | 419 | <xsd:attribute name="BigEndian" use="optional" type="xsd:boolean"> |
414 | 420 | <xsd:annotation> |
Download in other formats:
1.3.13-PRO © 2008-2011
Agilo Software all
rights reserved
(this page was served in: 0.23612 sec.)