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

sqlite: skip reading featureset if no wkb is found; rasterlite: link to boost libs on mac os x

Browse source
This commit is contained in:
Dane Springmeyer 2010-10-01 20:16:49 +00:00
parent 6e31bacf2c
commit d4306abf7d
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/input/rasterlite/SConscript
View file

@ -34,9 +34,12 @@ rasterlite_src = Split(
) )
libraries = [env['PLUGINS']['rasterlite']['lib']] libraries = [env['PLUGINS']['rasterlite']['lib']]
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik2') libraries.append('mapnik2')
libraries.append(env['ICU_LIB_NAME']) 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']) rasterlite_inputdriver = plugin_env.SharedLibrary('../rasterlite', source=rasterlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS'])

2
plugins/input/sqlite/sqlite_featureset.cpp
View file

@ -67,6 +67,8 @@ feature_ptr sqlite_featureset::next()
{ {
int size; int size;
const char* data = (const char *) rs_->column_blob (0, size); const char* data = (const char *) rs_->column_blob (0, size);
if (!data)
return feature_ptr();
int feature_id = rs_->column_integer (1); int feature_id = rs_->column_integer (1);
#ifdef MAPNIK_DEBUG #ifdef MAPNIK_DEBUG