Changeset 12251

Show
Ignore:
Timestamp:
09/28/07 12:22:27 (1 year ago)
Author:
hobu
Message:

apply patch for #1815

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/gdal/swig/python/scripts/gdal2tiles.py

    r12250 r12251  
    3535from gdalconst import GA_ReadOnly 
    3636from osr import SpatialReference 
    37 from math import ceil, log 
     37from math import ceil, log10 
     38import operator 
    3839 
    3940verbose = False 
     
    715716        sys.exit( 1 ) 
    716717 
     718 
     719    # Python 2.2 compatibility. 
     720    log2 = lambda x: log10(x) / log10(2) # log2 (base 2 logarithm) 
     721    sum = lambda seq, start=0: reduce( operator.add, seq, start) 
     722 
    717723    # Zoom levels of the pyramid. 
    718     maxzoom = int(max( ceil(log(xsize/float(tilesize), 2)), ceil(log(ysize/float(tilesize), 2)))) 
     724    maxzoom = int(max( ceil(log2(xsize/float(tilesize))), ceil(log2(ysize/float(tilesize))))) 
    719725    zoompixels = [geotransform[1] * 2.0**(maxzoom-zoom) for zoom in range(0, maxzoom+1)] 
    720726    tilecount = sum( [