Changeset 2516

Timestamp:

29/05/07 08:37:11 (14 years ago)

Author:

domlowe

Message:

ImageFile? reading sped up by use of image2array method

Location:

TI02-CSML/trunk

Files:

• csml/csmllibs/csmldataiface.py (modified) (4 diffs)
• setup.py (modified) (1 diff)

TI02-CSML/trunk/csml/csmllibs/csmldataiface.py

@@ -543 +543 @@
       self.extractType   = 'rawExtract'
       self.extractPrefix = '_rawextract_'
-
-
+ 
+ 
    def openFile(self, filename):
       self.file = open(filename, "rb")
@@ -579 +579 @@
       # Read and unpack data into a Numeric array.
       self.data = Numeric.array(struct.unpack(format_str, self.file.read()))
-      
-      # The order of dimensions in Numeric arrays do not correspond with
-      # the order of dimensions in traditional image files, so we need to
-      # reverse the dimensions before shaping the array.
-      dimensions = map(int, kwargs['dimensions'])
-      dimensions.reverse()
-      self.data.shape = tuple(dimensions)
+      self.data.shape = tuple(map(int, kwargs['dimensions']))
       
       # If numericTransform or fillValue were provided, store them as 
@@ -677 +671 @@
       self.extractType   = 'imageExtract'
       self.extractPrefix = '_imageextract_'
+   
+   def image2array(self,im):
+       #Adapted from code by Fredrik Lundh, http://www.pythonware.com 
+       #http://effbot.org/zone/pil-numpy.htm
+        if im.mode not in ("L", "F"):
+            raise ValueError, "can only convert single-layer images"
+        if im.mode == "L":
+            a = Numeric.fromstring(im.tostring(), Numeric.UnsignedInt8)
+        else:
+            a = Numeric.fromstring(im.tostring(), Numeric.Float32)
+        a.shape = im.size[1], im.size[0]
+        return a
 
    def openFile(self, filename):
@@ -686 +692 @@
    def readFile(self, **kwargs):
       # Convert the image to a Numeric array
-      self.data = Numeric.array(self.file.getdata())
+      
+      self.data=self.image2array(self.file)
+      #slower method:
+      #self.data = Numeric.array(self.file.getdata())
 
       # The order of dimensions in Numeric arrays do not correspond with

TI02-CSML/trunk/setup.py

@@ -6 +6 @@
 """
 
-import ez_setup; ez_setup.use_setuptools()
+import ez_setup;ez_setup.use_setuptools()
 from setuptools import setup, find_packages
 
 setup(
     name = 'csml',
-    version = '2.0',
+    version = '2.0b',
     author = 'Dominic Lowe',
     author_email = 'd.lowe@rl.ac.uk',