Changeset 822

Timestamp:

07/25/06 19:17:05 (2 years ago)

Author:

callan

Message:

Merged bug fixes from ticket #255 (r821) into the M2 branch.

Location:

branches/3.0-M2/components/rendering/src/omeis/providers/re/data

Files:

• Plane2D.java (modified) (5 diffs)
• PlaneFactory.java (modified) (1 diff)

branches/3.0-M2/components/rendering/src/omeis/providers/re/data/Plane2D.java

@@ -33 +33 @@
 
 //Third-party libraries
+import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.MappedByteBuffer;
@@ -98 +99 @@
     /** The Java type that we're using for pixel value retrieval */
     protected int          javaType;
+    
+    /** The sign of the type **/
+    protected boolean      signed;
         
 
@@ -124 +128 @@
         this.bytesPerPixel = PlaneFactory.bytesPerPixel(type);
         this.javaType = PlaneFactory.javaType(type);
+        this.signed = PlaneFactory.isTypeSigned(type);
         
         log.info("Created Plane2D with dimensions " + sizeX + "x" + sizeY + "x"
@@ -140 +145 @@
      * @return The offset.
      */
-        protected abstract int calculateOffset(int x1, int x2);
+         protected abstract int calculateOffset(int x1, int x2);
 
     /**
@@ -157 +162 @@
                 int offset = calculateOffset(x1, x2);
 
-                switch(javaType)
+                if (signed)
                 {
-                        case PlaneFactory.BYTE:
-                                return data.get(offset);
-                        case PlaneFactory.SHORT:
-                                return data.getShort(offset);
-                        case PlaneFactory.INT:
-                                return data.getInt(offset);
-                        case PlaneFactory.FLOAT:
-                                return data.getFloat(offset);
-                        case PlaneFactory.DOUBLE:
-                                return data.getDouble(offset);
-                }
+                    switch(javaType)
+                    {
+                        case PlaneFactory.BYTE:
+                            return data.get(offset);
+                        case PlaneFactory.SHORT:
+                            return data.getShort(offset);
+                        case PlaneFactory.INT:
+                            return data.getInt(offset);
+                        case PlaneFactory.FLOAT:
+                            return data.getFloat(offset);
+                        case PlaneFactory.DOUBLE:
+                            return data.getDouble(offset);
+                    }
+                } else
+        {
+            switch(javaType)
+            {
+                case PlaneFactory.BYTE:
+                    return (short) (data.get(offset) & 0xff);
+                case PlaneFactory.SHORT:
+                    return (int) (data.getShort(offset) & 0xffff);
+                case PlaneFactory.INT:
+                    return (long) (data.getInt(offset) & 0xffffffffL);
+            }            
+        }       
                 throw new RuntimeException("Unknown pixel type.");
         }
-        
 }

branches/3.0-M2/components/rendering/src/omeis/providers/re/data/PlaneFactory.java

@@ -115 +115 @@
                                 + type.getValue() + "'");
     }
+    
+    /**
+     * A static helper method to retrieve pixel byte signage.
+     * 
+     * @param type The pixels type for which you want to know the byte width.
+     * @return The number of bytes per pixel value.
+     */
+    static boolean isTypeSigned(PixelsType type)
+    {
+        if (in(type, new String[] {"uint8", "uint16", "uint32"}))
+            return false;
+        else if (in(type, new String[] { "int8", "int16", "int32", "float", "double"}))
+            return true;
+        else
+            throw new RuntimeException("Unknown pixel type: '"
+                    + type.getValue() + "'");
+    }
+    
     
     /**