diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-18 09:45:47 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-02-18 09:45:47 +0100 |
| commit | f61aa8a01961cff194fcf49c66e4ca9b4bd68052 (patch) | |
| tree | 189e5bc87ac99a73f515b3800c2e1898c732f7b3 /test/unit/test_c_api.cpp | |
| parent | 24ce8716974020600aa22fe7334628a29f578774 (diff) | |
| parent | 4277e15cefae5bb1d49312498e0f626b652e7524 (diff) | |
| download | PROJ-f61aa8a01961cff194fcf49c66e4ca9b4bd68052.tar.gz PROJ-f61aa8a01961cff194fcf49c66e4ca9b4bd68052.zip | |
Merge remote-tracking branch 'osgeo/master' into 6.0
Diffstat (limited to 'test/unit/test_c_api.cpp')
| -rw-r--r-- | test/unit/test_c_api.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/unit/test_c_api.cpp b/test/unit/test_c_api.cpp index 273a04e6..6205a9b8 100644 --- a/test/unit/test_c_api.cpp +++ b/test/unit/test_c_api.cpp @@ -1389,7 +1389,7 @@ TEST_F(CApi, proj_create_operations_with_pivot) { ASSERT_NE(ctxt, nullptr); ContextKeeper keeper_ctxt(ctxt); proj_operation_factory_context_set_allow_use_intermediate_crs( - m_ctxt, ctxt, false); + m_ctxt, ctxt, PROJ_INTERMEDIATE_CRS_USE_NEVER); auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); @@ -1444,6 +1444,8 @@ TEST_F(CApi, proj_create_operations_with_pivot) { m_ctxt, ctxt, PROJ_SPATIAL_CRITERION_PARTIAL_INTERSECTION); proj_operation_factory_context_set_grid_availability_use( m_ctxt, ctxt, PROJ_GRID_AVAILABILITY_IGNORED); + proj_operation_factory_context_set_allow_use_intermediate_crs( + m_ctxt, ctxt, PROJ_INTERMEDIATE_CRS_USE_ALWAYS); auto res = proj_create_operations(m_ctxt, source_crs, target_crs, ctxt); ASSERT_NE(res, nullptr); |