1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
Description: TemplateTest: Update expected fails for PROJ 8.2.0
Origin: upstream, https://github.com/OpenOrienteering/mapper/commit/e247f7270fc36ac9c62abe2f179a891d1df98616
Author: Kai Pastor <dg0yt@darc.de>
Last-Update: 2021-12-17
--- 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 @@
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 @@
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
|
