diff options
| author | Dave Woodfall <dave@slackbuilds.org> | 2022-02-22 18:35:13 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-02-23 20:10:28 +0700 |
| commit | 0047f2b3b871a81fd84a3127ff59c8fa2c94bc83 (patch) | |
| tree | a6f72c66758a53b6d7881579e6f49aab1a28ab48 /ham/qradiopredict/qradiopredict-gdal2.patch | |
| parent | 45f6a2cdb84fa06465f2dfbebf502fb3859d7113 (diff) | |
ham/qradiopredict: Removed.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'ham/qradiopredict/qradiopredict-gdal2.patch')
| -rw-r--r-- | ham/qradiopredict/qradiopredict-gdal2.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/ham/qradiopredict/qradiopredict-gdal2.patch b/ham/qradiopredict/qradiopredict-gdal2.patch deleted file mode 100644 index f6b55a9391096..0000000000000 --- a/ham/qradiopredict/qradiopredict-gdal2.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -u -r qradiopredict-0.8.8/QRadioPredict/shpreader.cpp qradiopredict-0.8.8-patched/QRadioPredict/shpreader.cpp ---- qradiopredict-0.8.8/QRadioPredict/shpreader.cpp 2014-02-24 07:56:11.000000000 +0000 -+++ qradiopredict-0.8.8-patched/QRadioPredict/shpreader.cpp 2016-03-20 21:04:43.097658012 +0000 -@@ -104,9 +104,15 @@ - OGRRegisterAll(); - QString file = name; - file.append(".shp"); -- OGRDataSource *poDS; - -+#if GDAL_VERSION_MAJOR < 2 -+ OGRDataSource *poDS; - poDS = OGRSFDriverRegistrar::Open( file.toStdString().c_str(), FALSE ); -+#else -+ GDALDataset *poDS; -+ poDS = (GDALDataset*) OGROpen( file.toStdString().c_str(), FALSE, NULL ); -+#endif -+ - if( poDS == NULL ) - { - qDebug() << "Shapefile opening failed: " << name; -@@ -119,7 +125,11 @@ - if(poLayer == NULL) - { - qDebug() << "Shapefile layer is fubar: " << poLayer->GetName(); -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource( poDS ); -+#else -+ GDALClose( (GDALDatasetH) poDS ); -+#endif - return QString("None"); - } - -@@ -171,7 +181,11 @@ - qDebug() << "Using GEOS for: " << terrain_type; - delete [] buffer; - OGRFeature::DestroyFeature( poFeature ); -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource( poDS ); -+#else -+ GDALClose( (GDALDatasetH) poDS ); -+#endif - return terrain_type; - } - delete[] buffer; -@@ -233,7 +247,11 @@ - if(poly) - delete poly; - OGRFeature::DestroyFeature( poFeature ); -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource( poDS ); -+#else -+ GDALClose( (GDALDatasetH) poDS ); -+#endif - return terrain_type; - } - -@@ -255,7 +273,11 @@ - { - //qDebug() << terrain_type; - OGRFeature::DestroyFeature( poFeature ); -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource( poDS ); -+#else -+ GDALClose( (GDALDatasetH) poDS ); -+#endif - return terrain_type; - } - */ -@@ -267,7 +289,11 @@ - OGRFeature::DestroyFeature( poFeature ); - } - -+#if GDAL_VERSION_MAJOR < 2 - OGRDataSource::DestroyDataSource( poDS ); -+#else -+ GDALClose( (GDALDatasetH) poDS ); -+#endif - - return QString("None"); - } |