From 9bb2d68766c5cc064352cc89045447949e090508 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 12:51:24 +0100 Subject: projects.h: remove #ifdef __cpluplus test since it must now be included from C++ file due to C++ objects in struct PJconsts --- src/gridcatalog.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gridcatalog.cpp') diff --git a/src/gridcatalog.cpp b/src/gridcatalog.cpp index fef2df56..8fb90efa 100644 --- a/src/gridcatalog.cpp +++ b/src/gridcatalog.cpp @@ -32,6 +32,7 @@ #include #include +#include "proj.h" #include "projects.h" static PJ_GridCatalog *grid_catalog_list = nullptr; -- cgit v1.2.3 From 1b1d60e83a20412aeca3e440705df820979af03b Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:22:34 +0100 Subject: projects.h: remove deprecated XY, XYZ, LP, LPZ, UV, UVW, projUV and projUVW structures --- src/gridcatalog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gridcatalog.cpp') diff --git a/src/gridcatalog.cpp b/src/gridcatalog.cpp index 8fb90efa..18f93b4e 100644 --- a/src/gridcatalog.cpp +++ b/src/gridcatalog.cpp @@ -123,7 +123,7 @@ int pj_gc_apply_gridshift( PJ *defn, int inverse, for( i = 0; i < point_count; i++ ) { long io = i * point_offset; - LP input, output_after, output_before; + PJ_LP input, output_after, output_before; double mix_ratio; PJ_GRIDINFO *gi; @@ -237,7 +237,7 @@ int pj_gc_apply_gridshift( PJ *defn, int inverse, /************************************************************************/ PJ_GRIDINFO *pj_gc_findgrid( projCtx ctx, PJ_GridCatalog *catalog, int after, - LP location, double date, + PJ_LP location, double date, PJ_Region *optional_region, double *grid_date ) { -- cgit v1.2.3 From 8ab6f683cd316acf57bb89ed83932a267c5aa3c2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 26 Dec 2018 14:58:26 +0100 Subject: Merge projects.h into proj_internal.h --- src/gridcatalog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gridcatalog.cpp') diff --git a/src/gridcatalog.cpp b/src/gridcatalog.cpp index 18f93b4e..ca5750ab 100644 --- a/src/gridcatalog.cpp +++ b/src/gridcatalog.cpp @@ -33,7 +33,7 @@ #include #include "proj.h" -#include "projects.h" +#include "proj_internal.h" static PJ_GridCatalog *grid_catalog_list = nullptr; -- cgit v1.2.3