diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-27 10:53:51 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-27 11:03:14 +0100 |
| commit | a4d389c37529bda488dc14fb4225e4dec40c0743 (patch) | |
| tree | 3531b98791f3aec23b382c62576be078f66f3fd8 /src/tests | |
| parent | 81ec8c0b58d66333fccd3703dab62a11132a0331 (diff) | |
| download | PROJ-a4d389c37529bda488dc14fb4225e4dec40c0743.tar.gz PROJ-a4d389c37529bda488dc14fb4225e4dec40c0743.zip | |
Remove proj_def.dat (fixes #201)
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/multistresstest.cpp | 13 | ||||
| -rw-r--r-- | src/tests/test228.cpp | 5 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/tests/multistresstest.cpp b/src/tests/multistresstest.cpp index 234783b3..33d2d738 100644 --- a/src/tests/multistresstest.cpp +++ b/src/tests/multistresstest.cpp @@ -46,7 +46,6 @@ #define num_threads 10 static int num_iterations = 1000000; static int reinit_every_iteration=0; -static int add_no_defs = 0; typedef struct { const char *src_def; @@ -179,15 +178,7 @@ static volatile int active_thread_count = 0; static projPJ custom_pj_init_plus_ctx(projCtx ctx, const char* def) { - if( add_no_defs ) - { - char szBuffer[256]; - strcpy(szBuffer, def); - strcat(szBuffer, " +no_defs"); - return pj_init_plus_ctx(ctx, szBuffer); - } - else - return pj_init_plus_ctx(ctx, def); + return pj_init_plus_ctx(ctx, def); } /************************************************************************/ @@ -462,8 +453,6 @@ int main( int argc, char **argv ) { if( strcmp(argv[i], "-reinit") == 0 ) reinit_every_iteration = 1; - else if( strcmp(argv[i], "-add_no_defs") == 0 ) - add_no_defs = 1; else if( strcmp(argv[i], "-num_iterations") == 0 && i+1 < argc ) { num_iterations = atoi(argv[i+1]); diff --git a/src/tests/test228.cpp b/src/tests/test228.cpp index fcacd7c9..4fadda94 100644 --- a/src/tests/test228.cpp +++ b/src/tests/test228.cpp @@ -36,10 +36,9 @@ static void* thread_main(void* unused) p_proj_ctxt=pj_ctx_alloc(); p_WGS84_proj=pj_init_plus_ctx(p_proj_ctxt,"+proj=longlat " - "+ellps=WGS84 +datum=WGS84 +no_defs"); + "+ellps=WGS84 +datum=WGS84"); p_OSGB36_proj=pj_init_plus_ctx(p_proj_ctxt, - "+proj=longlat +ellps=airy +datum=OSGB36 +nadgrids=OSTN02_NTv2.gsb " - "+no_defs"); + "+proj=longlat +ellps=airy +datum=OSGB36 +nadgrids=OSTN02_NTv2.gsb"); while(run) { |