Commit graph

6583 commits

Author SHA1 Message Date
artemp
a63df933d5 + only log transform evaluation if trans_expr is not null 2012-09-26 14:26:58 +01:00
artemp
a537c58afa + work-in-progress.. 2012-09-26 14:26:12 +01:00
artemp
fe011a988d + only log transform evaluation if trans_expr is not null 2012-09-26 14:24:26 +01:00
Dane Springmeyer
1af2faf56b formatting 2012-09-25 14:52:32 -07:00
Dane Springmeyer
d6821e8ce9 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-25 14:33:54 -07:00
Dane Springmeyer
e8abc8eef1 csv: stop adding WKT/JSON geometry data to attributes 2012-09-25 14:08:07 -07:00
artemp
32d52a1a78 Merge branch 'master' into conv_simplify 2012-09-25 10:35:53 +01:00
Manel Clos
a1dde7eff9 Query tolerance test 2012-09-25 10:51:49 +02:00
artemp
ae176d1d19 + use 'extent' for both raster.input and gdal.input 2012-09-24 17:12:03 +01:00
artemp
5c5c4fb76e + fix parameters names to be more css-ish 2012-09-24 16:14:17 +01:00
artemp
ac735e82c2 + make tile_size configurable for 'tiled' read policy 2012-09-24 13:39:03 +01:00
artemp
8fe932b7d1 + tiff_reader: make TIFF* 'cacheable', to avoid initialization under
certain conditions.
2012-09-24 13:35:22 +01:00
Hermann Kraus
1e6e2bdaa7 Merge branch 'master' into harfbuzz
Conflicts:
	bindings/python/mapnik/__init__.py
2012-09-23 13:28:08 +02:00
Hermann Kraus
4e6268014a Add dummy shaping engine. 2012-09-23 04:03:29 +02:00
Hermann Kraus
748cf62de3 Prepare for making HarfBuzz an optional dependency. 2012-09-23 03:19:47 +02:00
Hermann Kraus
7439eaed67 Merge branch 'harfbuzz' of github.com:mapnik/mapnik into harfbuzz 2012-09-23 02:55:07 +02:00
Hermann Kraus
60c3c590ed Reenable "name" tests.
Refs #1482.
2012-09-23 02:52:49 +02:00
Hermann Kraus
bbedec3437 Clean up directory structure. 2012-09-23 02:52:40 +02:00
Dane Springmeyer
52cf481043 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-21 13:35:15 -07:00
Dane Springmeyer
fca564614f csv plugin: improve newline detection - closes #1497 2012-09-21 13:34:43 -07:00
artemp
a7c02cf1d8 Merge remote-tracking branch 'origin/master' into conv_simplify 2012-09-19 14:07:34 +01:00
artemp
97463abf3d + ensure mesh doesn't overflow source raster extent - #1480 2012-09-19 13:53:56 +01:00
artemp
2834b2ad92 + not sure why we have do { } while(false); - removing 2012-09-19 13:51:53 +01:00
artemp
09d11122d5 Merge branch 'master' into conv_simplify 2012-09-18 10:36:14 +01:00
Dane Springmeyer
91a932d7e9 declare windows symbols for wkt and json parsing - closes #1491 2012-09-17 15:28:05 -07:00
artemp
01ae1a179d Merge branch 'master' into conv_simplify 2012-09-17 11:35:15 +01:00
Hermann Kraus
86ed99d8fe Clean up directory structure. 2012-09-16 02:11:14 +02:00
Dane Springmeyer
2d5287c298 rollback 1b4e7a8fd5 - refs #1489 and #1227 2012-09-14 18:45:09 -07:00
Dane Springmeyer
f3589ab4f9 Revert "no need for premultiplied types in warper"
This reverts commit 61e8a9c236.
2012-09-14 18:42:47 -07:00
Dane Springmeyer
657098fd48 fix git conflicts that snuck into the code 2012-09-14 18:35:54 -07:00
Dane Springmeyer
416c4c798c Merge branch 'master' of github.com:mapnik/mapnik 2012-09-14 18:33:54 -07:00
Hermann Kraus
b9ffd1f5b6 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-15 02:07:14 +02:00
Hermann Kraus
fa62234179 Merge branch 'master' into harfbuzz 2012-09-15 02:06:35 +02:00
Hermann Kraus
e629cbb1c3 Raise Exception instead of returning None. 2012-09-15 02:06:08 +02:00
Dane Springmeyer
67a96355a8 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-14 17:03:12 -07:00
Dane Springmeyer
af5f0cb243 fix reference raster images after fixing edge effects as per #1471 2012-09-14 17:02:53 -07:00
Dane Springmeyer
ad8e4e4cc7 Merge pull request #1366 from mapnik/debugsymbolizer
Debug Symbolizer
2012-09-14 16:43:38 -07:00
Hermann Kraus
18b6567e62 Merge branch 'master' of github.com:mapnik/mapnik 2012-09-15 01:41:02 +02:00
Hermann Kraus
406904a1f6 Merge branch 'master' into harfbuzz
Conflicts:
	bindings/python/mapnik/__init__.py
	include/mapnik/font_engine_freetype.hpp
	src/load_map.cpp
2012-09-15 01:39:33 +02:00
Dane Springmeyer
56585d11d9 when using style level compositing or image filters still trigger style processing callbacks even if we return without querying the data if there are active rules - closes #1477 2012-09-14 16:13:37 -07:00
Dane Springmeyer
1b3dcda87d add method off style to check for active rules 2012-09-14 16:11:37 -07:00
Dane Springmeyer
9b5189abf0 sqlite: improve the error when no key_field is set and the primary key cannot be autodetected 2012-09-14 16:10:51 -07:00
Hermann Kraus
1940014a48 Remove deprecation warnings. 2012-09-14 23:25:32 +02:00
Dane Springmeyer
8cfb40ae2f refactor fontsets making them optional on the symbolizer and removing the dangerous default contructor - closes #1483 (TODO - consider modifying insert_fontset to only take single arg of fontset instance) 2012-09-14 14:17:45 -07:00
Dane Springmeyer
4973136207 Add a test (currently failing) ensuring that named fontsets created in python are propertly serialized 2012-09-14 12:27:55 -07:00
Dane Springmeyer
73ae407156 rename fontset test to be consistencly named 2012-09-14 12:07:07 -07:00
Hermann Kraus
dc6ecc4be7 Reenable wrap-before and add tests for it. 2012-09-14 18:53:52 +02:00
Hermann Kraus
e5351ced6f Add missing reference images. 2012-09-14 18:05:52 +02:00
Dane Springmeyer
4d5ab83fb3 add harfbuzz custom paths to environment 2012-09-14 08:55:01 -07:00
artemp
fb8f50b0f5 Merge branch 'master' into conv_simplify 2012-09-14 13:15:42 +01:00