artemp
86d8b6ef5f
Merge branch 'patch-1' of https://github.com/glarrain/mapnik into glarrain-patch-1
2016-06-02 16:06:53 +02:00
Germán Larraín
a876070ccb
Fix markdown issue in C++ demo README
...
Commands were rendered incorrectly due to missing spaces, causing that `mapnik-config --prefix` was rendered without backticks, which are necessary.
2016-05-31 13:14:27 -03:00
Germán Larraín
503d4eaea1
fix shapefiles encoding in demo for C++
...
Mapnik builds without `boost_regex_icu` (see #3440 ) and the C++ demo does not run:
```
/mapnik# demo/c++/rundemo `mapnik-config --prefix`
running demo ...
### std::exception: could not create converter for latin1
```
2016-05-31 12:40:27 -03:00
Frederik Ramm
8af8737272
Fix DejaVu font directory
...
Fonts in Mapnik tree are now 2.35 not 2.34
2016-05-25 10:12:53 +02:00
artemp
8c6bf0eef6
update copyright notice
2015-06-16 12:49:16 +02:00
Blake Thompson
22a384ef33
Moved image_data_rgba8 to image_rgba8. Ref #2633
2015-01-21 20:31:02 -06:00
Blake Thompson
93f835177b
Removed all the code for the previous type of image and image_32. Ref #2633
2015-01-21 17:57:16 -06:00
Dane Springmeyer
4856886284
fix compile of rundemo.cpp
2015-01-20 19:37:31 -08:00
Blake Thompson
badb0c9a97
This is a complete removal of code that utilizes image_32 in the library. It is a sweeping change that does some of the following:
...
* Changes all agg_renderers to use a image_data_any variant (only image_data_rgba8 is implemented currently)
* Changes the marker and marker_cache to use image_data_any images
* Changes the symbolizers so that they must be aware of the source data type they are attempting to render and the render type that is expected to be rendered into.
* Moves many utilities into image_utils, that were previously in image_32.
The kicker is that this still isn't working perfectly yet, but I am commiting so I don't have tears in case everything is lost on my computer.
Ref #2633
2015-01-20 18:30:10 -06:00
Blake Thompson
42ee4ec90d
Moved cairo out of the image_util.*pp files and now have created a cairo_io.*pp files.
...
Ref #2622
2015-01-09 16:49:31 -05:00
Dane Springmeyer
fbecd5ff33
always pass image_data to save_to_string/file
2015-01-08 13:54:43 -08:00
Dane Springmeyer
acb3bb0821
trim down image_32 - refs #2627
2015-01-08 13:16:32 -08:00
artemp
333965b588
update copyright year
2014-11-20 15:25:50 +01:00
artemp
f686d3de1b
update dejavu-fonts-ttf path (v 2.34)
2014-10-23 11:35:20 +01:00
Dane Springmeyer
4621fd6445
fix srs in c++ demo
2014-10-23 00:15:33 -07:00
Dane Springmeyer
aae4a20ec9
fix various -Wunused-parameter warnings
2014-10-21 20:23:17 -07:00
Dane Springmeyer
c26c60e48e
remove set_old_style_expression
2014-10-09 20:51:43 -07:00
Dane Springmeyer
822d3a5bce
break apart symbolizer.hpp + fwd declars + svg output grammar impl
2014-09-30 12:50:08 -07:00
Dane Springmeyer
492e084714
add copy ctor to rule: avoids last copy of syms in load_map - closes #1293
2014-09-04 22:03:54 -07:00
artemp
8502019310
more format_properties expessions
2014-07-23 18:09:18 +01:00
artemp
e67f046a0e
start re-factoring char_property (TODO: change name!)
2014-07-23 16:19:14 +01:00
artemp
4afd98a34a
text_properties : store 'orientation' parameter in symbolizer_base::value_type
2014-07-11 14:43:56 +01:00
Dane Springmeyer
d0b357cab7
scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging
2014-06-09 13:55:56 -07:00
artemp
b6bab7d0bb
move cairo renderer into its own subdir
2014-06-06 13:38:00 +01:00
Dane Springmeyer
8c1e69fdb8
static grammars
...
- construct on first use
- allows for faster map loading and unloading of xml loading tree
- modified expression and transform grammars to not take args/not crash
- simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -07:00
Dane Springmeyer
ef837eb92f
c++11 optimizations for faster map loading
2014-04-28 17:10:00 -07:00
Dane Springmeyer
e9ca9c8790
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
Dane Springmeyer
0d58a8aee4
merge with 2.3.x
2013-10-28 14:45:52 -07:00
Dane Springmeyer
86dfa0778a
fix cairo reference counting and add more cairo context tests - closes #2031
2013-10-28 12:46:44 -07:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
Dane Springmeyer
9f5b7f3fb0
improve the c++ and python demo apps to conditionally output image formats
2013-09-18 14:32:43 -07:00
Dane Springmeyer
844baa8c5b
scons: when linking statically on linux always link -ldl
2013-07-30 02:51:07 -04:00
Dane Springmeyer
4f01eb05b1
scons: correctly propagate DEFINES across builds
2013-07-23 20:03:00 -04:00
Dane Springmeyer
0f8ecc2ed3
scons: static linking on linux needs -dl for executables
2013-07-14 15:17:32 -04:00
Dane Springmeyer
39eee919e5
link mapnik first (needed static linking on linux)
2013-07-14 13:00:53 -04:00
Dane Springmeyer
db7e5919d2
Fix example of building vs files with gyp on windows
2013-05-24 14:29:11 -06:00
Dane Springmeyer
d1d688bb8a
fix typo
2013-05-24 13:26:52 -07:00
Dane Springmeyer
47e62804be
rundemo.gyp now working on windows
2013-05-23 00:46:55 -07:00
Dane Springmeyer
9ede00abf8
rundemo standalone build fixes
2013-05-23 00:15:18 -07:00
Dane Springmeyer
5239bef595
add details for how to build rundemo.cpp standalone on windows with gyp
2013-05-22 23:23:11 -07:00
Dane Springmeyer
ca1171aa80
no need to cache config error specifically
2013-05-09 18:12:49 -07:00
Dane Springmeyer
e2c7283522
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
2013-03-13 19:49:59 -07:00
Dane Springmeyer
47ab9913ee
make consistent the proj4 string used for spherical mercator across tests and docs
2013-01-28 13:48:13 -05:00
artemp
9659349d8a
+ c++ demo: use the same map/layer srs settings as in Python demo
2013-01-11 14:50:49 +00:00
artemp
4a07a62bfd
+ use proper mapnik installation path aka prefix
...
```./rundemo /usr/local```
2013-01-10 20:48:56 +00:00
Dane Springmeyer
f135bd325e
fix compile of rundemo - now using new cairo internal interface that drops cairomm depedency
2013-01-09 12:48:05 -08:00
Dane Springmeyer
3378166b64
iwyu
2013-01-03 18:58:44 -08:00
artemp
967d6110bf
+ singleton: return ref from instance() method
2012-09-07 16:23:03 +01:00
Colin Rundel
dc3763885c
More parser clean up - color parser
...
Dropped color_factory class in favor of single color_parser function. Moved implementation to new color_factory.cpp since it is odd to have two headers (color.hpp, color_factory.hpp) and only one source file.
2012-08-29 16:41:48 -04:00
Dane Springmeyer
ac418a7d4e
remote the last references
2012-08-27 16:43:40 -07:00
