sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9147 commits 112 branches 95 tags 181 MiB
Commit graph

33 commits

Author SHA1 Message Date
artemp
333965b588 update copyright year 2014-11-20 15:25:50 +01:00
Dane Springmeyer
83588937b9 silence boost warnings 2014-10-21 16:37:27 -07:00
artemp
fe215a684e c++11 style : replace (almost) all typedef with type alias's 2014-07-07 18:23:15 +01:00
Dane Springmeyer
8bb77bce92 image readers: ability to check if image has alpha before full read 
Conflicts:
	src/webp_reader.cpp
 2014-06-16 09:52:26 -07:00
Dane Springmeyer
6c12904eda fix jpeg reading regression after #1805 - closes #2123 (patch from @clundgren) 2014-01-18 20:40:00 -08:00
Dane Springmeyer
3dba53e333 fix several -Wsign-compare warnings 2013-10-01 11:47:47 -07:00
artemp
0eada70845 + use const std::unique_ptr< []> instead of boost::scoped_array 2013-09-20 15:01:58 +01:00
artemp
62af2e6765 + replace <boost/shared_ptr.hpp> with <memory> 2013-09-20 14:13:23 +01:00
artemp
4f4e2b001e Merge branch 'master' into c++11 
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
 2013-08-30 09:46:09 +01:00
Dane Springmeyer
cfc977e6cd deal with various -Wunused-parameter warnings that are not important 2013-07-23 18:46:54 -04:00
artemp
4dd31056fc + fix warnings when compiling with g++ 4.2.1 on os x 2013-04-22 11:36:37 +01:00
artemp
3f6abd3362 + backport image_reader from buffer/string from image-readers-c++11 branch 2013-04-22 11:35:09 +01:00
artemp
1eb2ec5ce7 + cleanup include directives 2013-04-15 14:01:33 +01:00
artemp
9584b3634f + no iostreams lib dependency version 2013-04-12 16:10:09 +01:00
artemp
438bfad732 + factory : variadic templates based implementation ( requires c++11) 
+ image_reader : stream based reading interface (boost::iostreams)
+ register additional png and jpeg readers with following sigs :

  ```
  std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(buffer,size));
  // buffer - char const*
  // size - size_t
  ```
+ initial type_from_bytes implementation (TODO: add more types)
+ python : mapnik.Image.fromstring(str) mapnik.Image.frombuffer(buf)
 2013-04-12 12:46:40 +01:00
Dane Springmeyer
16e2e8a06f refactor jpeg reader to close fd after read - refs #1783 2013-04-09 18:36:02 -07:00
artemp
270b66318d + mapnik c++ naming style 2013-04-09 11:34:20 +01:00
artemp
2ca306290a + fix reading a region from JPEG file 
+ re-use jpeg lib structures
+ avoid resource leaking (store FILE in boost::shared_ptr with custom deleter)
 2013-04-08 15:56:19 +01:00
Dane Springmeyer
412aa510a1 fix jpeg/tiff error handling on failed reads - closes #1775 2013-03-25 18:29:29 -07:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08:00
Dane Springmeyer
a4b5549282 before caching marker premultiply only those image formats that might potentially need to be premultiplied 2012-10-04 16:07:24 -07:00
artemp
77e585895f + add premultiplied_alpha method to image_reader 
* tiff - TIFFTAG_EXTRASAMPLES
  * png  - non-premultiplied alpha (http://www.libpng.org/pub/png/spec/1.1/PNG-Rationale.html)
  * jpeg - no-alpha channel, ensure pre-multiplied model
 2012-09-28 16:37:21 +01:00
Dane Springmeyer
a12b8f1d2f c++ style 2012-09-03 10:27:48 -07:00
kunitoki
af201551b8 got rid of old CVS $Id comments kludge in files 2012-04-08 02:45:01 +02:00
kunitoki
1f351e0e09 implement new debug system 2012-04-08 02:20:56 +02:00
Dane Springmeyer
17d13cff67 whitespace fixes - closes #911 2012-02-01 17:53:35 -08:00
Dane Springmeyer
9e037920e0 c++ style include 2011-11-08 10:34:00 -08:00
kunitoki
f1fb0c1939 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
Dane Springmeyer
33f6cbf13d jpeg reader: make to sure call jpeg_finish_decompress if scanlines have been read 2011-04-04 04:03:03 +00:00
Dane Springmeyer
8f4386b7b2 use dynamically allocated, scoped array instead of variable-size array, which ISO C++ forbids 2011-04-02 03:07:45 +00:00
Dane Springmeyer
c1a6a54060 remove tabs 2011-04-01 20:47:26 +00:00
Dane Springmeyer
1b4f034ee5 add header needed for fopen on linux in jpeg_reader.cpp 2010-06-03 22:43:25 +00:00
Dane Springmeyer
6fc4d6f780 add support for reading jpeg images - closes #518 2010-06-03 21:24:58 +00:00