Changeset 11118

Timestamp:

03/31/07 22:56:23 (2 years ago)

Author:

warmerdam

Message:

Fixes for complex data support (bug #1518), array order compatibility
(bug #1542) and a missing qualifier on reshape().

Files:

• branches/1.4/gdal/swig/python/gdal_array.py (modified) (4 diffs)

branches/1.4/gdal/swig/python/gdal_array.py

@@ -19 +19 @@
-            gdalconst.GDT_Float32   :   numpy.float32,
-            gdalconst.GDT_Float64   :   numpy.float64,
-
-
-
-64
+64
+64
+64
+128
-        }
-
@@ -43 +43 @@
-def flip_code(code):
-    if isinstance(code, type):
+        # since several things map to complex64 we must carefully select
+        # the opposite that is an exact match (ticket 1518)
+        if code == numpy.complex64:
+            return gdalconst.GDT_CFloat32
+        
-        for key, value in codes.items():
-            if value == code:
@@ -99 +104 @@
-        band_array = BandReadAsArray( ds.GetRasterBand(band_index),
-                                      xoff, yoff, xsize, ysize)
-
+numpy.
-
-    return numpy.concatenate( array_list )
@@ -133 +138 @@
-                                 buf_xsize, buf_ysize, datatype )
-    ar = numpy.fromstring(band_str,dtype=typecode)
-1,win_ysize,win
+buf_ysize,buf
-    
-    return ar