Dane Springmeyer 71e7faed0d Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any ...

Conflicts:
	tests/python_tests/image_test.py
	tests/python_tests/image_tiff_test.py
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png
	tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png

2015-02-03 00:05:15 -08:00

..

csv

update copyright year

2014-11-20 15:25:50 +01:00

gdal

Move image_data.hpp to image.hpp and renamed most everything from image_data to image alone. This might lead to the need to clean up some variables that are currently named image through out the code at some time, but I think in the long term is much better as image is a better name for the base class.

2015-01-22 11:39:37 -06:00

geojson

unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp

2015-02-02 11:22:54 +01:00

occi

link to Oracle client library (libclntsh) to avoid missing symbols - ref #2659

2015-01-28 13:07:03 +01:00

ogr

update copyright year

2014-11-20 15:25:50 +01:00

osm

update copyright year

2014-11-20 15:25:50 +01:00

pgraster

get pgraster tests passing again + update expected images - refs #2639

2015-01-26 22:14:38 -08:00

postgis

#2651 is fixed, remove workaround in postgis plugin

2015-01-28 18:18:09 -08:00

python

silence boost warnings

2014-10-21 16:37:27 -07:00

raster

Move image_data.hpp to image.hpp and renamed most everything from image_data to image alone. This might lead to the need to clean up some variables that are currently named image through out the code at some time, but I think in the long term is much better as image is a better name for the base class.

2015-01-22 11:39:37 -06:00

rasterlite

fix compile of rasterlite plugin

2015-01-22 15:59:01 -08:00

shape

move mapnik::noncopyable to mapnik::util::noncopyable where it belongs

2015-01-07 13:11:09 +01:00

sqlite

move mapnik::noncopyable to mapnik::util::noncopyable where it belongs

2015-01-07 13:11:09 +01:00

templates

Update README.md

2015-01-21 14:28:12 -08:00

topojson

unicode string grammar via boost/libs/spirit/example/qi/json/json/parser/grammar.hpp

2015-02-02 11:22:54 +01:00