artemp
2a3af1eb40
move boost.geometry <-- mapnik::box2d<double> into separate header for better modularity and code re-use
2015-01-26 10:37:09 +01:00
artemp
1263bc9c2e
merge large geojson plug-in into geojson.input
2015-01-26 10:19:18 +01:00
artemp
44905ffc43
geojson.input - use adapted box2d<double> as box_type + make spatial index compatible with large_geojson
2015-01-26 09:42:06 +01:00
artemp
d45b9db86e
remove unused include directives
2015-01-26 09:41:20 +01:00
artemp
2f42cb91cc
Merge branch 'master' into large-geojson
2015-01-26 09:16:06 +01:00
Blake Thompson
31a0caf2e4
Merge branch 'master' into release/image_data_any
2015-01-25 14:09:29 -06:00
Blake Thompson
997da1e630
Fix for benchmark
2015-01-24 21:29:50 -06:00
Blake Thompson
f616367ac2
Including std library that was missing.
2015-01-24 21:16:36 -06:00
Blake Thompson
64ed541f88
Merge pull request #2653 from mapnik/bugfix/tiff_io
...
Bugfix/tiff io
2015-01-24 21:04:39 -06:00
Blake Thompson
5d9f047002
Fixed some issues in color and bindings where you could create a color and premultiplied was not set and it was resulting in it being assigned randomly, causing some issues at runtime.
...
Updated some images in visual tests that were orginally set prior to all tiffs being premultiplied, this was causing a slight difference in a few pixels.
Updated the tiff tests a lot.
Fixed tiff reader so that it always considers everything read from RGB or RGBA as premultiplied. This is due to the fact that RGBA reader always premultiplies the alpha no matter its original form.
Put in a fix so that the file does not exist no longer shows up in the test running.
Fixed some failing tests in the c++ test due to tiffs now always being premultiplied for RGB(A)
2015-01-24 20:48:15 -06:00
Dane Springmeyer
8d6b70ea70
bootstrap: split build time and runtime settings
2015-01-24 10:18:32 -08:00
Dane Springmeyer
80a141da78
config.py generation fixups
2015-01-24 10:10:07 -08:00
Dane Springmeyer
c69b4b1151
fix mason dir check
2015-01-24 10:07:26 -08:00
Dane Springmeyer
3e8b701194
bootstrap cleanups
2015-01-24 10:05:58 -08:00
Dane Springmeyer
93570f820a
mason bootstrap: expat and sqlite_rtree fixes
2015-01-24 08:51:16 -08:00
Dane Springmeyer
d930265467
mason bootstrap: ensure clang finds correct gcc-4.8 lib
2015-01-24 08:42:05 -08:00
Dane Springmeyer
2652649ea0
scons: fix sqlite_rtree linux configure test in absence of pkg-config
2015-01-24 08:41:06 -08:00
Dane Springmeyer
e26132cf9f
travis cleanup
2015-01-23 23:51:54 -08:00
Dane Springmeyer
6344b24193
travis: disable benchmarks, install nose
2015-01-23 23:29:24 -08:00
Dane Springmeyer
1a28cf763f
use clang
2015-01-23 23:05:41 -08:00
Dane Springmeyer
3ba834109a
debug configure fail
2015-01-23 23:01:08 -08:00
Dane Springmeyer
be1690d5c7
try sudoless clang upgrade
2015-01-23 22:57:45 -08:00
Dane Springmeyer
bdc49e2adb
fix mason setup
2015-01-23 21:44:32 -08:00
Dane Springmeyer
03192c5f2a
fix bash syntax
2015-01-23 20:42:03 -08:00
Blake Thompson
a100b2fe1f
Fixed the issues associated with TIFFs, now they always will return as premultiplied in the event they are rgba8 due to the way that the TIFF reader operates. Also added premultiply as a flag inside color class and exposed many of its components, made it so that setting and getting pixels took into consideration the state of the color and the image when dealing with the two.
2015-01-23 18:08:59 -06:00
Dane Springmeyer
e53f4e8637
sudoless
2015-01-23 14:21:54 -08:00
Dane Springmeyer
34b685db40
travis: try bootstraping deps with mason
2015-01-23 14:04:41 -08:00
artemp
7f0e77d172
Merge branch 'master' into large-geojson
2015-01-23 18:12:33 +01:00
Dane Springmeyer
6ab91b2300
allow manually passing lib/include paths for libxml2 and freetype
2015-01-23 09:12:11 -08:00
Dane Springmeyer
ec111c8a27
add extra metadata to lyr desc + use for srid/keyfield in postgis - closes #2650
2015-01-22 18:44:56 -08:00
Blake Thompson
490645d2e3
Perhaps a solution to TIFF IO problems
2015-01-22 20:36:45 -06:00
Dane Springmeyer
fcdc826294
Add (currently failing) test for #2651
2015-01-22 18:25:37 -08:00
Dane Springmeyer
faddf1a615
fix compile of rasterlite plugin
2015-01-22 15:59:01 -08:00
Dane Springmeyer
4a1f4a9b5e
Use geometry_table_ rather than table_ for SRID lookup
...
- this will result in a faster query in the case that
the user provides an explicit geometry_table option
2015-01-22 15:55:30 -08:00
Blake Thompson
51172c8fdf
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
Blake Thompson
e353225772
Modified the name of image_data_null to image_null.
2015-01-22 10:58:01 -06:00
artemp
58f770bf85
support BOOST_VERSION < 105600
2015-01-22 16:34:28 +01:00
artemp
e42d0deb61
correct types usage
2015-01-22 16:23:44 +01:00
artemp
2b82157127
cleanup
2015-01-22 16:21:01 +01:00
artemp
669d369e30
Merge branch 'master' into large-geojson
2015-01-22 16:12:14 +01:00
Blake Thompson
e01ce5b7d6
Changed image_data_gray* to image_gray* Ref #2633 .
2015-01-21 21:08:04 -06:00
Blake Thompson
22a384ef33
Moved image_data_rgba8 to image_rgba8. Ref #2633
2015-01-21 20:31:02 -06:00
Blake Thompson
e4a5424613
Merge branch 'release/image_data_any' of github.com:mapnik/mapnik into release/image_data_any
2015-01-21 19:40:23 -06:00
Blake Thompson
0f388ed68f
Changed the name of image_data_any to image_any. Moved header file for image_data_any to image_any. Ref #2633
2015-01-21 19:40:12 -06:00
Dane Springmeyer
82bc43c76f
fix stray include of graphics.hpp
2015-01-21 16:32:31 -08: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
Blake Thompson
b57b1c12d6
Some smaller fixes that cause the proper operator to be called in visitor_create_marker. All tests now passing. Ref #2633
2015-01-21 17:09:53 -06:00
Dane Springmeyer
d6175adb1a
Update README.md
2015-01-21 14:28:12 -08:00
Dane Springmeyer
df9613369e
temp fix: copy rather than move image_data inside marker to avoid mutating marker
2015-01-20 20:38:22 -08:00
Dane Springmeyer
4856886284
fix compile of rundemo.cpp
2015-01-20 19:37:31 -08:00
