artemp ea28abf203 Merge branch 'master' into image-readers-c++11 ...

Conflicts:
	bindings/python/mapnik_image.cpp
	include/mapnik/factory.hpp
	include/mapnik/image_reader.hpp
	src/image_reader.cpp
	src/jpeg_reader.cpp
	src/png_reader.cpp

2013-04-22 12:24:09 +01:00

..

csv

make a few utility functions inline and static

2013-02-26 10:52:41 -05:00

gdal

round floating point to int - refs #1672

2013-03-13 12:19:10 -07:00

geojson

fixup includes and value type and params usage across plugins

2013-01-04 09:23:06 -08:00

kismet

fixup includes and value type and params usage across plugins

2013-01-04 09:23:06 -08:00

occi

- better usage of mapnik::singleton instance in occi datasource

2013-04-08 15:18:48 +02:00

ogr

+ use std::unique_ptr instead of std::auto_ptr (deprecated!)

2013-04-19 09:50:50 +01:00

osm

remove way out of date and unmaintained demo app previously part of osm plugin code

2013-01-17 13:41:02 -08:00

postgis

fix handling of null values for feature id in sqlite/postgis input - closes #1817

2013-04-17 15:34:21 -07:00

python

add the python libpath to ensure proper linking

2013-03-12 18:43:58 -07:00

raster

+ use std::unique_ptr instead of std::auto_ptr (deprecated!)

2013-04-19 09:50:50 +01:00

rasterlite

fix compile of rasterlite plugin

2013-03-12 18:36:03 -07:00

shape

+ use std::unique_ptr instead of std::auto_ptr (deprecated!)

2013-04-19 09:50:50 +01:00

sqlite

fix handling of null values for feature id in sqlite/postgis input - closes #1817

2013-04-17 15:34:21 -07:00

templates

tests: make consistent the proj4 string for epsg:4326

2013-01-25 00:49:55 -08:00