[Tilecache] Diff for a couple of TileCache issues

[Beau Gunderson]

The first is not really an issue yet but will be when Mapnik 0.5.0 comes
out, which I think will be soon. I'm using the svn trunk so I hit it early.
Basically rawdata() went away in favor of tostring() on the image object
itself.

The second is just to make the fcgi version match the cgi version; on
FreeBSD I've got /usr/local/bin/python so I have to change it in every
installation. :)

I sent this to the labs@ address but then saw there was a mailing list and
figured someone else may be using the SVN version of Mapnik and might need
this soon.


Beau


Index: TileCache/Layers/Mapnik.py
===================================================================
--- TileCache/Layers/Mapnik.py  (revision 252)
+++ TileCache/Layers/Mapnik.py  (working copy)
@@ -1,4 +1,4 @@
-# BSD Licensed, Copyright (c) 2006-2008 MetaCarta, Inc.
+# BSD Licensed, Copyright (c) 2006-2007 MetaCarta, Inc.

 from TileCache.Layer import MetaLayer

@@ -56,7 +56,7 @@

         im = mapnik.Image( *tile.size() )
         mapnik.render(m, im)
-        im = PIL.Image.fromstring('RGBA', tile.size(), mapnik.rawdata(im))
+        im = PIL.Image.fromstring('RGBA', tile.size(), im.tostring())
         buffer = StringIO.StringIO()
         im.save(buffer, self.extension)
         buffer.seek(0)
Index: tilecache.fcgi
===================================================================
--- tilecache.fcgi      (revision 252)
+++ tilecache.fcgi      (working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 from TileCache.Service import wsgiApp

 if __name__ == '__main__':
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.osgeo.org/pipermail/tilecache/attachments/20080127/a8a1a7d0/attachment.html