Changeset 11113

Show
Ignore:
Timestamp:
03/31/07 22:29:30 (1 year ago)
Author:
warmerdam
Message:

Restore "old generation" array order for BandReadAsArray?() (bug #1542).
Also fixed missing qualifier on reshape in DatasetReadAsArray?().

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gdal/swig/python/gdal_array.py

    r11111 r11113  
    104104        band_array = BandReadAsArray( ds.GetRasterBand(band_index), 
    105105                                      xoff, yoff, xsize, ysize) 
    106         array_list.append( reshape( band_array, [1,ysize,xsize] ) ) 
     106        array_list.append( numpy.reshape( band_array, [1,ysize,xsize] ) ) 
    107107 
    108108    return numpy.concatenate( array_list ) 
    …… 
    138138                                 buf_xsize, buf_ysize, datatype ) 
    139139    ar = numpy.fromstring(band_str,dtype=typecode) 
    140     ar = numpy.reshape(ar, [1,buf_ysize,buf_xsize]) 
     140    ar = numpy.reshape(ar, [buf_ysize,buf_xsize]) 
    141141     
    142142    return ar