sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ no iostreams lib dependency version

Browse source
This commit is contained in:
artemp 2013-04-12 16:10:09 +01:00
parent 28ea89fe1c
commit 9584b3634f
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/build.py
View file

@ -55,10 +55,9 @@ ABI_VERSION = env['ABI_VERSION']
filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
regex = 'boost_regex%s' % env['BOOST_APPEND'] regex = 'boost_regex%s' % env['BOOST_APPEND']
system = 'boost_system%s' % env['BOOST_APPEND'] system = 'boost_system%s' % env['BOOST_APPEND']
iostreams = 'boost_iostreams%s' % env['BOOST_APPEND']
# clear out and re-set libs for this env # clear out and re-set libs for this env
lib_env['LIBS'] = ['freetype','z',env['ICU_LIB_NAME'],filesystem,system,regex,iostreams] lib_env['LIBS'] = ['freetype','z',env['ICU_LIB_NAME'],filesystem,system,regex]
if env['PROJ']: if env['PROJ']:
lib_env['LIBS'].append('proj') lib_env['LIBS'].append('proj')

5
src/jpeg_reader.cpp
View file

@ -33,7 +33,8 @@ extern "C"
// boost // boost
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <boost/iostreams/device/file_descriptor.hpp> #include <boost/iostreams/device/file.hpp>
//#include <boost/iostreams/device/file_descriptor.hpp>
#include <boost/iostreams/device/array.hpp> #include <boost/iostreams/device/array.hpp>
#include <boost/iostreams/stream.hpp> #include <boost/iostreams/stream.hpp>
@ -98,7 +99,7 @@ namespace
{ {
image_reader* create_jpeg_reader(std::string const& file) image_reader* create_jpeg_reader(std::string const& file)
{ {
return new jpeg_reader<boost::iostreams::file_descriptor_source>(file); return new jpeg_reader<boost::iostreams::file_source>(file);
} }
image_reader* create_jpeg_reader2(char const* data, size_t size) image_reader* create_jpeg_reader2(char const* data, size_t size)

4
src/png_reader.cpp
View file

@ -31,7 +31,7 @@ extern "C"
// boost // boost
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <boost/iostreams/device/file.hpp> #include <boost/iostreams/device/file.hpp>
#include <boost/iostreams/device/file_descriptor.hpp> //#include <boost/iostreams/device/file_descriptor.hpp>
//#include <boost/iostreams/device/mapped_file.hpp> //#include <boost/iostreams/device/mapped_file.hpp>
#include <boost/iostreams/stream.hpp> #include <boost/iostreams/stream.hpp>
@ -84,7 +84,7 @@ namespace
image_reader* create_png_reader(std::string const& file) image_reader* create_png_reader(std::string const& file)
{ {
return new png_reader<boost::iostreams::file_descriptor_source>(file); return new png_reader<boost::iostreams::file_source>(file);
} }
image_reader* create_png_reader2(char const * data, std::size_t size) image_reader* create_png_reader2(char const * data, std::size_t size)