Changeset 1596 for branches/3.0-Beta2/components/romio/src/ome/io/nio/DeltaVisionHeader.java

Timestamp:

06/05/07 20:08:58 (18 months ago)

Author:

david

Message:

DeltaVision? pixelbuffer testing unfinished

Files:

• branches/3.0-Beta2/components/romio/src/ome/io/nio/DeltaVisionHeader.java (modified) (6 diffs)

branches/3.0-Beta2/components/romio/src/ome/io/nio/DeltaVisionHeader.java

@@ -2 +2 @@
 
 import java.nio.ByteOrder;
+import java.nio.CharBuffer;
 import java.nio.MappedByteBuffer;
+
+import ome.io.nio.utests.DeltaVisionTest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
@@ -53 +59 @@
         private String imageType;
 
+        private transient static Log log = LogFactory.getLog(DeltaVisionHeader.class);
+
         /**
          * Constructor
@@ -61 +69 @@
         public DeltaVisionHeader(MappedByteBuffer data, boolean endian) {
 
+
                 // make sure this is a header
                 if (data.capacity() != IMAGE_HEADER_SIZE) {
@@ -67 +76 @@
                 }
 
+                // set our data
+                this.data = data;
+
                 // endianness
                 if (isNative()) {
+                        data.order(ByteOrder.BIG_ENDIAN);
+                } else {
                         data.order(ByteOrder.LITTLE_ENDIAN);
-                } else {
-                        data.order(ByteOrder.BIG_ENDIAN);
-                }
-
-                // set our data
-                this.data = data;
+                }
+                
         }
 
@@ -91 +101 @@
          */
         public int getImageCount() {
-                return data.getShort(IMAGE_COUNT_OFFSET);
+                return data.getInt(IMAGE_COUNT_OFFSET);
         }
 
@@ -163 +173 @@
          */
         public int getSizeZ() {
-                return getImageCount() / getSizeC() * getSizeT();
+                
+                int result = 0;
+                if (getSizeC() == 0) {
+                        result = getImageCount() / getSizeT();
+                } else if (getSizeT() == 0) {
+                        result = getImageCount() / getSizeC();
+                } else {
+                        result = getImageCount()/(getSizeT() * getSizeC());
+                }
+                
+                return result;
         }