artemp
|
9ba25cefe4
|
large_geojson - use 'C' style I/O for performance
|
2015-01-20 11:30:27 +01:00 |
|
artemp
|
9a74a55dd6
|
formatting
|
2015-01-20 11:29:58 +01:00 |
|
artemp
|
85cacfe378
|
use vector<char> as a buffer
|
2015-01-20 10:36:34 +01:00 |
|
artemp
|
bfe1d63ea0
|
debug : print total extent
|
2015-01-19 22:06:24 +01:00 |
|
artemp
|
a408a84fb0
|
ignore invalid bounding boxes from "geometry": null
|
2015-01-19 22:04:21 +01:00 |
|
artemp
|
1f693b8fa2
|
larger_geojson - store {offset, size} in spatial index and remove multi_pass requirement
TODO: try std::fread instead of ifstream, use std::vector<uint8_t> instead of std::string
|
2015-01-19 18:10:59 +01:00 |
|
artemp
|
15a83ff54d
|
extract bounding boxes from GeoJSON - re-implement grammar to store offset and size of "Feature" elements
|
2015-01-19 18:09:23 +01:00 |
|
Blake Thompson
|
aa03cf4f7c
|
Implemented a new get_pixel method to go along with the set_pixel method in image_util. Ref #2633
|
2015-01-16 22:15:33 -06:00 |
|
Blake Thompson
|
a002139e18
|
Added set_pixel to visitor pattern and moved it to image_util. Added exception throwing in composite only if debug flags are on.
Ref #2633
|
2015-01-16 18:26:56 -06:00 |
|
Blake Thompson
|
1470bea9cb
|
Migrated composite_pixel out of image_32, it is now in image_utils. Ref #2633
|
2015-01-16 16:48:43 -06:00 |
|
Blake Thompson
|
0b2c4e57cf
|
Merge_rectangle has met the wood chipper. Ref #2633
|
2015-01-16 16:04:02 -06:00 |
|
Blake Thompson
|
a7b8ca2888
|
Moved set_rectangle out of image_32 into image_util.
Ref #2633
|
2015-01-16 15:36:53 -06:00 |
|
Blake Thompson
|
35be6117c8
|
Merge branch 'master' into release/image_data_any
|
2015-01-16 13:09:25 -06:00 |
|
Blake Thompson
|
aebb6fee58
|
Removed the background and set/get background from image_32 class. Removed clear method from image_32. Added new fill method for image_data_any, that allows many generic types to fill an image.
Ref #2633
|
2015-01-16 13:06:52 -06:00 |
|
artemp
|
f50a34d1b8
|
use boost::spirit::iterator_policies::first_owner in multi_pass
|
2015-01-16 17:54:04 +01:00 |
|
artemp
|
da02dc40c2
|
sort index array by offsets
|
2015-01-16 17:19:59 +01:00 |
|
artemp
|
b15224af1b
|
add <iomanip> for std::setprecision
|
2015-01-16 17:19:17 +01:00 |
|
artemp
|
0c280b5066
|
reduce verbosity
|
2015-01-16 16:41:38 +01:00 |
|
artemp
|
da960fea33
|
use std::advance to work with std::iterators
|
2015-01-16 16:40:28 +01:00 |
|
artemp
|
b6cd3b37ef
|
store {bbox, offset} to match boost.geometry rtree instantiation
|
2015-01-16 16:24:31 +01:00 |
|
artemp
|
788fd8c80b
|
large_geojson.input - initial implementation
|
2015-01-16 16:22:46 +01:00 |
|
artemp
|
8b19793dc8
|
fix grammar (use iter_pos parser instead of hacking raw[] directive) + cleanups
|
2015-01-16 10:05:02 +01:00 |
|
artemp
|
785cf5c09f
|
extract_bounding_box grammar initial impl
|
2015-01-16 09:48:57 +01:00 |
|
Blake Thompson
|
ff019cbe28
|
Merge pull request #2645 from mapnik/feature/set_alpha_move
Moved set_alpha to src/image_util.cpp and out of image_32. Added a boole...
|
2015-01-15 21:06:06 -06:00 |
|
Blake Thompson
|
5bc83eee49
|
Added a new test for set_color_to_alpha
|
2015-01-15 21:03:42 -06:00 |
|
Blake Thompson
|
33ccc12355
|
Moved set_color_to_alpha and set_grayscale_to_alpha to image_util.
Ref # 2633
|
2015-01-15 20:26:20 -06:00 |
|
Blake Thompson
|
3b1c99ff1b
|
Moved set_alpha to src/image_util.cpp and out of image_32. Added a boolean response to premultiply_alpha and demultiply_alpha so that if it is changed in set_alpha and other locations like the python bindings for composite that the image can be restored to its original state. Removed blend from python bindings.
Ref #2633
|
2015-01-15 17:57:21 -06:00 |
|
Blake Thompson
|
c74df56200
|
Merge pull request #2643 from mapnik/feature/blend_cleanup
Removed the set_rectangle_alpha code from image_32. Added new blend usin...
|
2015-01-15 15:11:44 -06:00 |
|
Blake Thompson
|
1f540b42c6
|
Removed the set_rectangle_alpha code from image_32. Added new blend using composite to python bindings to replace it by doing src_over with composite.
Ref #2633
|
2015-01-15 13:01:32 -06:00 |
|
Blake Thompson
|
58f5812425
|
Merge pull request #2637 from mapnik/feature/is_solid_move
is_solid to image_util
|
2015-01-15 11:17:11 -06:00 |
|
Blake Thompson
|
4d3145991d
|
Removed some commented out code in src/image.cpp
|
2015-01-15 11:00:58 -06:00 |
|
Blake Thompson
|
0a1a0b405b
|
Merge branch 'feature/is_solid_move' of github.com:mapnik/mapnik into feature/is_solid_move
Conflicts:
include/mapnik/image_util.hpp
|
2015-01-15 11:00:40 -06:00 |
|
Blake Thompson
|
73d9c60168
|
Small fix for is solid to work with image_view_any and image_data_any properly.
|
2015-01-15 10:53:21 -06:00 |
|
Dane Springmeyer
|
cf646030f3
|
move is_solid to hpp for now to avoid linking errors
|
2015-01-15 10:21:11 -06:00 |
|
Dane Springmeyer
|
61bc705117
|
fix linking error with saving image
|
2015-01-15 10:14:01 -06:00 |
|
Dane Springmeyer
|
40c1649b0e
|
fix is_solid return
|
2015-01-15 10:14:00 -06:00 |
|
Blake Thompson
|
7ce7416999
|
Added is_solid to image_utils. It is currently built to support the eventual use of image_view_any and image_data_any, but for a limited time supports the passing of image_view_rgba8 and image_data_rgba8.
Ref #2633
|
2015-01-15 10:14:00 -06:00 |
|
Dane Springmeyer
|
508521d5e5
|
move is_solid to hpp for now to avoid linking errors
|
2015-01-14 21:20:15 -08:00 |
|
Dane Springmeyer
|
d0d899a9dd
|
fix linking error with saving image
|
2015-01-14 21:19:45 -08:00 |
|
Dane Springmeyer
|
e03739e316
|
fix is_solid return
|
2015-01-14 21:10:39 -08:00 |
|
Dane Springmeyer
|
7d2db67cf3
|
Merge pull request #2640 from mapnik/feature/premultiply_demultiply_move
Feature/premultiply demultiply move
|
2015-01-14 21:04:43 -08:00 |
|
Dane Springmeyer
|
364fb4961b
|
fix handling of premultiplied pixels during rendering
|
2015-01-14 21:04:05 -08:00 |
|
Dane Springmeyer
|
1f25bae0f4
|
fix compile of svg2png
|
2015-01-14 21:03:35 -08:00 |
|
Dane Springmeyer
|
39d8d65343
|
Merge pull request #2642 from mapnik/group-markers
Support MarkersSymbolizer in GroupSymbolizer
|
2015-01-14 18:58:27 -08:00 |
|
Dane Springmeyer
|
b55d5def0d
|
sync with latest master/3.x
|
2015-01-14 18:35:40 -08:00 |
|
Blake Thompson
|
202a0e8e5f
|
Added a lot of premultiply_alpha functions to attempt to have proper premultiplication of data prior to compositing. There still seem to be some errors in the resulting images, but I am not quite sure what they are yet.
|
2015-01-14 18:29:00 -06:00 |
|
Blake Thompson
|
42c7d7ddf2
|
Merge branch 'release/image_data_any' into feature/premultiply_demultiply_move
|
2015-01-14 15:37:06 -06:00 |
|
Blake Thompson
|
03440c0108
|
Merge branch 'master' into release/image_data_any
|
2015-01-14 15:36:03 -06:00 |
|
Blake Thompson
|
cbc76f7361
|
Some minor corrections to allow for the source to build properly with out linking errors with vis to hidden.
|
2015-01-14 15:24:16 -06:00 |
|
Blake Thompson
|
4184f75011
|
Moved premultiply and demultiply out of image_32 and other parts of the code. The image_data object is now responsible for keeping track of its own premultiplied_alpha status. Created a new utility method in image_util to preform premultiplication.
Added visitor pattern to several different methods as well to prepare for image_data_any including compositing.
Ref #2633
|
2015-01-14 12:42:30 -06:00 |
|