diff --git a/src/build.py b/src/build.py index 1c45abf1a..e6b9b9b8f 100644 --- a/src/build.py +++ b/src/build.py @@ -55,10 +55,9 @@ ABI_VERSION = env['ABI_VERSION'] filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] regex = 'boost_regex%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 -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']: lib_env['LIBS'].append('proj') diff --git a/src/jpeg_reader.cpp b/src/jpeg_reader.cpp index c90f31df4..09f16f33d 100644 --- a/src/jpeg_reader.cpp +++ b/src/jpeg_reader.cpp @@ -33,7 +33,8 @@ extern "C" // boost #include #include -#include +#include +//#include #include #include @@ -98,7 +99,7 @@ namespace { image_reader* create_jpeg_reader(std::string const& file) { - return new jpeg_reader(file); + return new jpeg_reader(file); } image_reader* create_jpeg_reader2(char const* data, size_t size) diff --git a/src/png_reader.cpp b/src/png_reader.cpp index 67a873f65..4facf9a84 100644 --- a/src/png_reader.cpp +++ b/src/png_reader.cpp @@ -31,7 +31,7 @@ extern "C" // boost #include #include -#include +//#include //#include #include @@ -84,7 +84,7 @@ namespace image_reader* create_png_reader(std::string const& file) { - return new png_reader(file); + return new png_reader(file); } image_reader* create_png_reader2(char const * data, std::size_t size)