Skip to content

Commit

Permalink
fix #2283
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed Jun 25, 2014
1 parent ebde535 commit b237a60
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plugins/input/ogr/ogr_datasource.cpp
Expand Up @@ -119,7 +119,7 @@ void ogr_datasource::init(mapnik::parameters const& params)
#if GDAL_VERSION_MAJOR >= 2
unsigned int nOpenFlags = GDAL_OF_READONLY | GDAL_OF_VECTOR;
const char* papszAllowedDrivers[] = { driver.c_str(), NULL };
dataset_ = static_cast<gdal_dataset_type>(GDALOpenEx(dataset_name_.c_str(),nOpenFlags,papszAllowedDrivers,NULL,NULL));
dataset_ = reinterpret_cast<gdal_dataset_type>(GDALOpenEx(dataset_name_.c_str(),nOpenFlags,papszAllowedDrivers,NULL,NULL));
#else
OGRSFDriver * ogr_driver = OGRSFDriverRegistrar::GetRegistrar()->GetDriverByName(driver.c_str());
if (ogr_driver && ogr_driver != nullptr)
Expand All @@ -132,7 +132,7 @@ void ogr_datasource::init(mapnik::parameters const& params)
{
// open ogr driver
#if GDAL_VERSION_MAJOR >= 2
dataset_ = static_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), FALSE, NULL));
dataset_ = reinterpret_cast<gdal_dataset_type>(OGROpen(dataset_name_.c_str(), FALSE, NULL));
#else
dataset_ = OGRSFDriverRegistrar::Open(dataset_name_.c_str(), FALSE);
#endif
Expand Down

0 comments on commit b237a60

Please sign in to comment.