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

Merge commit '218aca2159af9b14fb5e263df674ca652bc18ef2' into harfbuzz

Browse source 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
This commit is contained in:
Hermann Kraus 2013-03-16 18:15:37 +01:00
commit 5930da6be5
3 changed files with 359 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/input/occi/occi_datasource.cpp
View file

@ -252,10 +252,10 @@ occi_datasource::occi_datasource(parameters const& params)
case oracle::occi::OCCIBFLOAT:
case oracle::occi::OCCIDOUBLE:
case oracle::occi::OCCIBDOUBLE:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double));
break;
case oracle::occi::OCCINUMBER:
case oracle::occi::OCCI_SQLT_NUM:
desc_.add_descriptor(attribute_descriptor(fld_name,mapnik::Double));
break;
case oracle::occi::OCCICHAR:
case oracle::occi::OCCISTRING:
case oracle::occi::OCCI_SQLT_AFC:

4
plugins/input/occi/occi_featureset.cpp
View file

@ -155,10 +155,10 @@ feature_ptr occi_featureset::next()
break;
case oracle::occi::OCCIDOUBLE:
case oracle::occi::OCCIBDOUBLE:
feature->put(fld_name, rs_->getDouble(i + 1));
break;
case oracle::occi::OCCINUMBER:
case oracle::occi::OCCI_SQLT_NUM:
feature->put(fld_name, rs_->getDouble(i + 1));
break;
case oracle::occi::OCCICHAR:
case oracle::occi::OCCISTRING:
case oracle::occi::OCCI_SQLT_AFC:

355
workspace/All.files
View file

File diff suppressed because it is too large Load diff