diff options
| author | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-03-12 18:39:00 +0000 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2020-03-12 18:39:00 +0000 |
| commit | a495d8b73ba254babdfa8ac5a7258702f443d3ce (patch) | |
| tree | b41d4d142794a7b40a1768afebe38a993ce44a23 /src/grids.cpp | |
| parent | b3ff509f612da451240a9dabeb4e967f19146574 (diff) | |
| download | PROJ-a495d8b73ba254babdfa8ac5a7258702f443d3ce.tar.gz PROJ-a495d8b73ba254babdfa8ac5a7258702f443d3ce.zip | |
Fix build with gcc 4.8.5 (fixes #2062)
Diffstat (limited to 'src/grids.cpp')
| -rw-r--r-- | src/grids.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/grids.cpp b/src/grids.cpp index b9da072c..7842d39b 100644 --- a/src/grids.cpp +++ b/src/grids.cpp @@ -1373,7 +1373,8 @@ VerticalShiftGridSet::open(PJ_CONTEXT *ctx, const std::string &filename) { if (IsTIFF(header_size, header)) { #ifdef TIFF_ENABLED - auto set = GTiffVGridShiftSet::open(ctx, std::move(fp), actualName); + auto set = std::unique_ptr<VerticalShiftGridSet>( + GTiffVGridShiftSet::open(ctx, std::move(fp), actualName)); if (!set) pj_ctx_set_errno(ctx, PJD_ERR_FAILED_TO_LOAD_GRID); return set; @@ -2351,7 +2352,8 @@ HorizontalShiftGridSet::open(PJ_CONTEXT *ctx, const std::string &filename) { } else if (IsTIFF(header_size, reinterpret_cast<const unsigned char *>(header))) { #ifdef TIFF_ENABLED - auto set = GTiffHGridShiftSet::open(ctx, std::move(fp), actualName); + auto set = std::unique_ptr<HorizontalShiftGridSet>( + GTiffHGridShiftSet::open(ctx, std::move(fp), actualName)); if (!set) pj_ctx_set_errno(ctx, PJD_ERR_FAILED_TO_LOAD_GRID); return set; @@ -2686,8 +2688,8 @@ GenericShiftGridSet::open(PJ_CONTEXT *ctx, const std::string &filename) { if (IsTIFF(header_size, header)) { #ifdef TIFF_ENABLED - auto set = - GTiffGenericGridShiftSet::open(ctx, std::move(fp), actualName); + auto set = std::unique_ptr<GenericShiftGridSet>( + GTiffGenericGridShiftSet::open(ctx, std::move(fp), actualName)); if (!set) pj_ctx_set_errno(ctx, PJD_ERR_FAILED_TO_LOAD_GRID); return set; |