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

53 commits

Author SHA1 Message Date
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
f286363ad0 more consistent memset/memcpy usage 2014-01-28 15:05:10 -08:00
Dane Springmeyer
08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
 2013-11-07 09:21:05 -08:00
Dane Springmeyer
f49654b160 png_reader: quote filenames in error output 2013-11-06 16:26:42 -08:00
Dane Springmeyer
f66fe78c03 png_reader ensure we throw early if a file_source cannot be opened 2013-11-06 15:34:26 -08:00
Dane Springmeyer
61dde4b093 fix several -Wsign-compare warnings 2013-10-01 11:48:27 -07: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
Dane Springmeyer
9aff3c596b better type handling/casts 2013-09-18 20:29:26 -07: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
Dane Springmeyer
43723d3f81 scons: link zlib last 2013-07-15 00:19:03 -04:00
Dane Springmeyer
09aad15eb2 display png error when we cannot read a png 2013-07-14 16:32:32 -04:00
Dane Springmeyer
215c9e9123 iwyu 2013-06-06 13:10:56 -07:00
Dane Springmeyer
c6da53af9a fix spelling of error message in png reader - refs #1871 2013-06-03 15:38:30 -07:00
artemp
dbcffe6179 + better naming 2013-05-13 10:26:04 +01: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
6e29ceb55f further cleanup png struct handling - refs #1783 2013-04-09 17:43:15 -07:00
Dane Springmeyer
97eda69015 avoid png_struct leak - refs #1783 2013-04-09 17:37:44 -07:00
Dane Springmeyer
dfb65d810c avoid unused arguments compiler warning 2013-04-09 16:51:30 -07:00
artemp
b6ce472414 + add png file guard 2013-04-09 11:39:16 +01:00
artemp
9fb6c596b0 + fix region reading, so png's can be used in raster.input 2013-04-08 17:25:22 +01:00
Dane Springmeyer
bb27156df0 use internal noncopyable class to speed up compile times slightly 2012-12-16 18:19:52 -08: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
Dane Springmeyer
0516c2f59a amend cd7ad3e15e by avoiding use of setjmp which does not compile with latest png (as per #772) - see also #1258 2012-06-16 15:50:46 -04:00
Carl Simonson
cd7ad3e15e Catch and throw PNG exceptions - fixes #1213 
The png library uses setjmp/longjmp to throw exceptions when reading. If this
is not set up, the png library calls abort(). This change handles the errors
and throws a C++ exception instead.

This issue was found by testing images from pngsuite at
http://www.schaik.com/pngsuite/. These images are included and a unit test was
added to test both images that should be successful and images that should
throw an exception.
 2012-06-06 17:52:41 -05:00
Artem Pavlenko
7c0824f40b + read whole image at once if we have enough memory and x0==0 && y0==0 
(adds support for Adam7 interlacing )
 2012-04-10 15:51:30 +01:00
kunitoki
b60c508c1c - finish thrashing all the useless ifdef MAPNIK_LOG 2012-04-09 21:41:56 +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
kunitoki
f1fb0c1939 - fix copyright to 2011 (script to do this will follow) 2011-10-23 15:04:25 +02:00
Dane Springmeyer
d0e98eb3f1 handle return of fread 2011-04-01 23:54:58 +00:00
Artem Pavlenko
d0b1e62c2d + removed deprecated direct access to io_ptr 2010-06-14 13:18:09 +00:00
Artem Pavlenko
246731874b + apply 'mapnik-format' to *.cpp *.hpp 2010-06-02 11:03:30 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +00:00
Artem Pavlenko
8d820d4761 + use boost::scoped_ptr 2009-07-03 09:25:18 +00:00
David
bc54b150ea - reversed header include order 2007-10-08 17:42:41 +00:00
David
b2df387a9d - merged strict-xml-branch r530:532 to trunk: 
- libxml2 support
    - strict error handling while parsing XML map files
    - implemented save_map()
    - removed some duplicate defaults
    - all symbolizers with icons share a common base class now
 2007-09-25 18:47:12 +00:00
Artem Pavlenko
bbab2d90bf fixed png reader bug : 
fill alpha channel with 0xff on expansion
 2006-12-01 15:23:19 +00:00
Artem Pavlenko
ebdd0f6030 disable clog printing in release mode. Pass -DMAPNIK_DEBUG to enable. 2006-11-19 17:13:33 +00:00
Artem Pavlenko
992af4747d 1. move include to mapnik/include 
2. update demos,bibdibgs etc.
 2006-10-04 11:22:18 +00:00
Artem Pavlenko
26a406706e wrap C headers with : 
extern "C" 
{
 // 
}
 2006-08-31 21:32:07 +00:00
Artem Pavlenko
cdc48edfd6 1. validate image reader 
2. open files in binary mode (win32)
 2006-04-05 08:27:45 +00:00
Artem Pavlenko
61fd258fd1 changing licence from GPL to LGPL 2006-03-31 10:32:02 +00:00