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
Blake Thompson
e04b0617e7
Added myself to authors
...
What a self promoting bastard.
2015-01-13 13:34:03 -06:00
artemp
8063fa0f5e
viewer - use new image APIs and fix compilation
2015-01-13 11:46:20 +01:00
artemp
c2bba2b622
fix noncopyable usage
2015-01-13 11:45:07 +01:00
artemp
235326c8db
image_32 : add image_32(image_data_rgba8 &&) ctor
2015-01-13 11:44:24 +01:00
Dane Springmeyer
056feb4daa
add text-transform:reverse + full test coverage for text-transform uppercase/lowercase/capitalize - closes #2634
2015-01-12 15:38:21 -08:00
Blake Thompson
f58f65ee4c
Merge branch 'master' into release/image_data_any
2015-01-12 15:07:00 -06:00
Blake Thompson
2379c396c3
Removed unrequired save_as_jpeg in image_util.hpp
2015-01-12 15:06:39 -06:00
Blake Thompson
7a16ebe7fa
Merge remote-tracking branch 'origin/image' into release/image_data_any
2015-01-12 14:51:08 -06:00
Dane Springmeyer
248c8a79c2
enable rasterlite error again, accidentally disabled in 62dbfea
2015-01-09 16:13:57 -08:00
Dane Springmeyer
62dbfeaa28
fix rasterlite plugin + add visual test - closes #2630
2015-01-09 16:13:04 -08:00
Dane Springmeyer
ac04512bb5
fix rasterlite linking when deps are static libs
2015-01-09 15:37:45 -08:00
Dane Springmeyer
6580ff784f
add unit tests for rasterlite plugin
2015-01-09 15:36:41 -08:00
Blake Thompson
d7f758e073
Undo change to localize
2015-01-09 16:51:04 -05: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
34743bfe27
Merge pull request #2632 from mapnik/better-svg-marker-overrides
...
Amend/partially revert #2609
2015-01-09 13:37:44 -08:00
Dane Springmeyer
c7bb16fcd9
amend/partially revert #2609
2015-01-09 12:11:41 -08:00
Dane Springmeyer
014af51d95
repack svg::path_attributes - drops 387 -> 376 (then 360 with gradient packing) - refs #2631
2015-01-09 11:56:52 -08:00
Dane Springmeyer
2a5dd5e924
pack mapnik::gradient to save 8 bytes (128 -> 120) - refs #2631
2015-01-09 11:43:17 -08:00
Dane Springmeyer
bfb0878147
add to map deprecations tests
2015-01-09 10:59:18 -08:00
Dane Springmeyer
32586c6462
add test ensuring we can still parse deprecated styling properties
2015-01-09 10:48:50 -08:00
Dane Springmeyer
ad3e214beb
stop using deprecated marker-type in visual tests
2015-01-09 10:26:20 -08:00
Blake Thompson
b2118b6c2e
Merge branch 'master' into bugfix/image_util_impl
2015-01-09 11:00:42 -05:00
Dane Springmeyer
879e9d517b
test coverage for #827 / 52d0e3e6
2015-01-08 18:01:43 -08:00
Dane Springmeyer
a96cf38a33
fix compile of new cxx tests if tiff is not available - closes #2625
2015-01-08 17:44:41 -08:00
Dane Springmeyer
2747fd5329
fix python bindings after #2629
2015-01-08 17:38:22 -08:00
Blake Thompson
b05e6b8c51
Merge branch 'master' into bugfix/image_util_impl
2015-01-08 20:25:53 -05:00
Blake Thompson
08c675e1a4
Merge branch 'master' into bugfix/image_util_impl
...
Conflicts:
include/mapnik/image_view.hpp
src/image_util.cpp
2015-01-08 20:25:15 -05:00
Dane Springmeyer
049be27b1e
fix compile when building against pycairo headers
2015-01-08 16:35:55 -08:00
Blake Thompson
094d0ec3e1
Another large set of modifications, finally allow this branch to build. Mostly modifications to the image_util_* files. Different processing based on the image type is now possible, and save_to_stream now could possibly accept grayscale with out breaking existing code.
2015-01-08 19:31:14 -05:00
Dane Springmeyer
b263b7993e
Merge pull request #2629 from mapnik/less_image_32
...
Less image_32
2015-01-08 14:49:45 -08:00
Blake Thompson
035557450d
Split out the process for tiff, webp, and jpeg into their own util folders. Added the intial concepts for an image_view_any variant.
2015-01-08 16:55:51 -05:00
Dane Springmeyer
d22ad11b09
remove unneeded image_32 signatures for save_to_string/file after fbecd5f
2015-01-08 13:55:25 -08:00
Dane Springmeyer
fbecd5ff33
always pass image_data to save_to_string/file
2015-01-08 13:54:43 -08:00
Dane Springmeyer
96cff81f57
restore compile of map_request_test (asserts still disabled - refs #2575 )
2015-01-08 13:52:55 -08:00
Dane Springmeyer
acb3bb0821
trim down image_32 - refs #2627
2015-01-08 13:16:32 -08:00
Dane Springmeyer
e4cb1b33a0
remove getData and getBytes on image_view (they are unused) - refs #2627
2015-01-08 10:52:40 -08:00
Dane Springmeyer
63ccb4c36c
remove try/except around 'import mapnik' which is more trouble than help
2015-01-08 10:32:24 -08:00
Blake Thompson
472e41966d
Added new scaling trait for image_32 as it is a part of image_data_any
2015-01-08 11:52:44 -05:00
Blake Thompson
81ef4225ac
Continuing to modify various areas of image_util so that save_to_stream will be provided an image_data_any object.
2015-01-08 11:30:02 -05:00
Blake Thompson
847682d783
Some more minor changes
2015-01-08 10:17:07 -05:00
Blake Thompson
cc0a27f2f0
More stuff to break it all
2015-01-08 10:17:07 -05:00
Blake Thompson
454326df17
An intial commit of a large set of changes attempting to clean up the way that saving images is processed in image_util.hpp and image_util.cpp.
...
* Changed the passing of rgba_palette to a shared_ptr in order to better facilitate the use of a visitor pattern.
* Moved PNG util processing into its own set of files so that image_util_impl.hpp would not have to depend on HAVE_PNG.
2015-01-08 10:13:06 -05:00
artemp
8db7f58e8f
image_compositing - fix composite method signature to composite(T & dst, T const& src,...) via providing const_rendering_buffer adapter
2015-01-08 12:45:04 +01:00
artemp
515491ab70
image_compositing - fix composite method signature to composite(T & dst, T const& src,...) via providing const_rendering_buffer adapter
2015-01-08 12:42:38 +01:00
artemp
b53430110a
Merge branch 'master' into image
2015-01-08 10:27:21 +01:00
