diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2018-12-31 11:37:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 11:37:51 +0100 |
| commit | 32f3ef47e55c38b0eabb6d781fee3944d3239414 (patch) | |
| tree | ba2850500ee732559bada055dbab281ceff49a22 /src/gridcatalog.cpp | |
| parent | 5c41d3a1078895ed096b416db15c91108bccad87 (diff) | |
| parent | 0e0e0e475414ddeb75e0e140d8a3381a431036d9 (diff) | |
| download | PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.tar.gz PROJ-32f3ef47e55c38b0eabb6d781fee3944d3239414.zip | |
Merge pull request #1208 from rouault/merge_PJ_and_PJ_OBJ
Unify PJ_OBJ and PJ structures
Diffstat (limited to 'src/gridcatalog.cpp')
| -rw-r--r-- | src/gridcatalog.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gridcatalog.cpp b/src/gridcatalog.cpp index fef2df56..ca5750ab 100644 --- a/src/gridcatalog.cpp +++ b/src/gridcatalog.cpp @@ -32,7 +32,8 @@ #include <stdlib.h> #include <string.h> -#include "projects.h" +#include "proj.h" +#include "proj_internal.h" static PJ_GridCatalog *grid_catalog_list = nullptr; @@ -122,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; @@ -236,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 ) { |