]>
Commit | Line | Data |
---|---|---|
9639d9e1 JR |
1 | --- qlandkartegt-1.8.1/3rdparty/map2gcm/main.cpp~ 2014-08-08 11:53:46.000000000 +0200 |
2 | +++ qlandkartegt-1.8.1/3rdparty/map2gcm/main.cpp 2019-04-06 10:31:37.345289713 +0200 | |
3 | @@ -40,7 +40,7 @@ | |
4 | #define _MKSTR(x) _MKSTR_1(x) | |
5 | #endif | |
6 | ||
7 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
8 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
9 | #define WHAT_STR "map2gcm, Version " VER_STR | |
10 | ||
11 | #define MAX_TILE_SIZE 1024 | |
12 | --- qlandkartegt-1.8.1/3rdparty/map2rmap/main.cpp~ 2014-08-08 11:53:42.000000000 +0200 | |
13 | +++ qlandkartegt-1.8.1/3rdparty/map2rmap/main.cpp 2019-04-06 10:35:40.638287282 +0200 | |
14 | @@ -33,7 +33,7 @@ | |
15 | #define _MKSTR(x) _MKSTR_1(x) | |
16 | #endif | |
17 | ||
18 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
19 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
20 | #define WHAT_STR "map2rmap, Version " VER_STR | |
21 | ||
22 | ||
23 | --- qlandkartegt-1.8.1/3rdparty/map2rmp/main.cpp~ 2014-08-08 11:53:46.000000000 +0200 | |
24 | +++ qlandkartegt-1.8.1/3rdparty/map2rmp/main.cpp 2019-04-06 10:36:14.732042916 +0200 | |
25 | @@ -32,7 +32,7 @@ | |
26 | #define _MKSTR(x) _MKSTR_1(x) | |
27 | #endif | |
28 | ||
29 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
30 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
31 | #define WHAT_STR "map2rmp, Version " VER_STR | |
32 | ||
33 | int main(int argc, char ** argv) | |
34 | --- qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp~ 2014-08-08 11:53:46.000000000 +0200 | |
35 | +++ qlandkartegt-1.8.1/3rdparty/map2rmp/CFileGenerator.cpp 2019-04-06 10:36:57.432572912 +0200 | |
36 | @@ -27,7 +27,7 @@ | |
37 | #define _MKSTR(x) _MKSTR_1(x) | |
38 | #endif | |
39 | ||
40 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
41 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
42 | ||
43 | ||
44 | extern "C" | |
45 | --- qlandkartegt-1.8.1/3rdparty/map2jnx/main.cpp~ 2014-08-08 11:53:42.000000000 +0200 | |
46 | +++ qlandkartegt-1.8.1/3rdparty/map2jnx/main.cpp 2019-04-06 10:37:28.652961115 +0200 | |
47 | @@ -51,7 +51,7 @@ | |
48 | #define _MKSTR(x) _MKSTR_1(x) | |
49 | #endif | |
50 | ||
51 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
52 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
53 | #define WHAT_STR "map2jnx, Version " VER_STR | |
54 | ||
55 | #define JNX_MAX_TILES 50000 //6250 | |
56 | --- qlandkartegt-1.8.1/3rdparty/cache2gtiff/main.cpp~ 2014-08-08 11:53:46.000000000 +0200 | |
57 | +++ qlandkartegt-1.8.1/3rdparty/cache2gtiff/main.cpp 2019-04-06 10:37:57.093315233 +0200 | |
58 | @@ -35,7 +35,7 @@ | |
59 | #define _MKSTR(x) _MKSTR_1(x) | |
60 | #endif | |
61 | ||
62 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
63 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
64 | #define WHAT_STR "cache2gtiff, Version " VER_STR | |
65 | ||
66 | ||
67 | --- qlandkartegt-1.8.1/src/version.h~ 2014-08-08 11:53:29.000000000 +0200 | |
68 | +++ qlandkartegt-1.8.1/src/version.h 2019-04-06 10:39:26.654433027 +0200 | |
69 | @@ -23,6 +23,6 @@ | |
70 | #define _MKSTR(x) _MKSTR_1(x) | |
71 | #endif | |
72 | ||
73 | -#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP) | |
74 | +#define VER_STR _MKSTR(VER_MAJOR) "." _MKSTR(VER_MINOR) "." _MKSTR(VER_STEP) | |
75 | #define WHAT_STR "QLandkarte GT, Version " VER_STR | |
76 | #endif //VERSION_H |