TemplateTest: Update expected fails for PROJ 8.2.0

Origin: upstream, https://github.com/OpenOrienteering/mapper/commit/e247f7270fc36ac9c62abe2f179a891d1df98616
Last-Update: 2021-12-17

Gbp-Pq: Name proj8.2.0.patch

diff --git a/test/template_t.cpp b/test/template_t.cpp
index 51cf52f13228a5ab7b5326c4a7dc0d38a77b2d26..60fa1e845a91eec88f9b33b235193c307b8dac1c 100644 (file)
--- a/test/template_t.cpp
+++ b/test/template_t.cpp
@@ -51,6 +51,8 @@
 
 #ifdef ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
 #  include <proj_api.h>
+#else
+#  include <proj.h>
 #endif
 
 #include "test_config.h"
@@ -444,7 +446,7 @@ private slots:
                QVERIFY(map.getTemplate(template_index)->loadTemplateFile());
                QCOMPARE(temp->getTemplateState(), Template::Loaded);
 
-#if !defined(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H) || PJ_VERSION >= 600
+#if (!defined(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H) && (PROJ_VERSION_MAJOR)*100+(PROJ_VERSION_MINOR) < 802) || PJ_VERSION >= 600
                QEXPECT_FAIL("TemplateTrack from v0.8.4", "Unsupported WGS 84 -> NAD 83 transformation", Continue);
 #else
                QEXPECT_FAIL("TemplateTrack NAD83", "Unsupported WGS 84 -> NAD 83 transformation", Continue);
@@ -567,7 +569,7 @@ private slots:
                        ogr_template_center = center(temp);
                }
                
-#if !defined(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H) || PJ_VERSION >= 600
+#if (!defined(ACCEPT_USE_OF_DEPRECATED_PROJ_API_H) && (PROJ_VERSION_MAJOR)*100+(PROJ_VERSION_MINOR) < 802) || PJ_VERSION >= 600
                QEXPECT_FAIL("TemplateTrack NAD83", "Unsupported WGS 84 -> NAD 83 transformation", Continue);
                QEXPECT_FAIL("OgrTemplate NAD83", "Unsupported WGS 84 -> NAD 83 transformation", Continue);
 #endif