From d4306abf7d9542ae875eb9fae23da24ed63f86d8 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 1 Oct 2010 20:16:49 +0000 Subject: [PATCH] sqlite: skip reading featureset if no wkb is found; rasterlite: link to boost libs on mac os x --- plugins/input/rasterlite/SConscript | 3 +++ plugins/input/sqlite/sqlite_featureset.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/plugins/input/rasterlite/SConscript b/plugins/input/rasterlite/SConscript index 56afadfa7..375bd4fdb 100644 --- a/plugins/input/rasterlite/SConscript +++ b/plugins/input/rasterlite/SConscript @@ -34,9 +34,12 @@ rasterlite_src = Split( ) libraries = [env['PLUGINS']['rasterlite']['lib']] + if env['PLATFORM'] == 'Darwin': libraries.append('mapnik2') libraries.append(env['ICU_LIB_NAME']) + libraries.append('boost_system%s' % env['BOOST_APPEND']) + libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) rasterlite_inputdriver = plugin_env.SharedLibrary('../rasterlite', source=rasterlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) diff --git a/plugins/input/sqlite/sqlite_featureset.cpp b/plugins/input/sqlite/sqlite_featureset.cpp index eb0c10c7c..878b4453a 100644 --- a/plugins/input/sqlite/sqlite_featureset.cpp +++ b/plugins/input/sqlite/sqlite_featureset.cpp @@ -67,6 +67,8 @@ feature_ptr sqlite_featureset::next() { int size; const char* data = (const char *) rs_->column_blob (0, size); + if (!data) + return feature_ptr(); int feature_id = rs_->column_integer (1); #ifdef MAPNIK_DEBUG