Skip to content

Commit b4901a3

Browse files
committed
Use newest version of gdal.hpp
1 parent 02d26a9 commit b4901a3

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

include/gdalcpp.hpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
66
C++11 wrapper classes for GDAL/OGR.
77
8-
Version 1.2.0
8+
Version 1.3.0
99
1010
https://github.com/joto/gdalcpp
1111
12-
Copyright 2015-2018 Jochen Topf <jochen@topf.org>
12+
Copyright 2015-2021 Jochen Topf <jochen@topf.org>
1313
1414
Boost Software License - Version 1.0 - August 17th, 2003
1515
@@ -42,8 +42,6 @@ DEALINGS IN THE SOFTWARE.
4242
#include <ogr_api.h>
4343
#include <ogrsf_frmts.h>
4444

45-
#include <osmium/util/compatibility.hpp>
46-
4745
#include <cstdint>
4846
#include <algorithm>
4947
#include <memory>
@@ -52,6 +50,12 @@ DEALINGS IN THE SOFTWARE.
5250
#include <utility>
5351
#include <vector>
5452

53+
#if defined(_MSC_VER)
54+
# define GDALCPP_EXPORT __declspec(dllexport)
55+
#else
56+
# define GDALCPP_EXPORT __attribute__ ((visibility("default")))
57+
#endif
58+
5559
namespace gdalcpp {
5660

5761
#if GDAL_VERSION_MAJOR >= 2
@@ -65,7 +69,7 @@ namespace gdalcpp {
6569
/**
6670
* Exception thrown for all errors in this class.
6771
*/
68-
class OSMIUM_EXPORT gdal_error : public std::runtime_error {
72+
class GDALCPP_EXPORT gdal_error : public std::runtime_error {
6973

7074
std::string m_driver;
7175
std::string m_dataset;
@@ -192,7 +196,7 @@ namespace gdalcpp {
192196

193197
SRS() :
194198
m_spatial_reference() {
195-
const auto result = m_spatial_reference.SetWellKnownGeogCS("WGS84");
199+
const auto result = m_spatial_reference.SetWellKnownGeogCS("CRS84");
196200
if (result != OGRERR_NONE) {
197201
throw gdal_error{std::string{"can not initialize spatial reference system WGS84"},
198202
result};
@@ -516,4 +520,6 @@ namespace gdalcpp {
516520

517521
} // namespace gdalcpp
518522

523+
#undef GDALCPP_EXPORT
524+
519525
#endif // GDALCPP_HPP

0 commit comments

Comments
 (0)