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/pipeline.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/pipeline.cpp')
| -rw-r--r-- | src/pipeline.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pipeline.cpp b/src/pipeline.cpp index 76fc58a5..4b4ba3a7 100644 --- a/src/pipeline.cpp +++ b/src/pipeline.cpp @@ -104,7 +104,7 @@ Thomas Knudsen, thokn@sdfe.dk, 2016-05-20 #include "geodesic.h" #include "proj.h" #include "proj_internal.h" -#include "projects.h" +#include "proj_internal.h" PROJ_HEAD(pipeline, "Transformation pipeline manager"); @@ -122,10 +122,10 @@ struct pj_opaque { static PJ_COORD pipeline_forward_4d (PJ_COORD point, PJ *P); static PJ_COORD pipeline_reverse_4d (PJ_COORD point, PJ *P); -static XYZ pipeline_forward_3d (LPZ lpz, PJ *P); -static LPZ pipeline_reverse_3d (XYZ xyz, PJ *P); -static XY pipeline_forward (LP lp, PJ *P); -static LP pipeline_reverse (XY xy, PJ *P); +static PJ_XYZ pipeline_forward_3d (PJ_LPZ lpz, PJ *P); +static PJ_LPZ pipeline_reverse_3d (PJ_XYZ xyz, PJ *P); +static PJ_XY pipeline_forward (PJ_LP lp, PJ *P); +static PJ_LP pipeline_reverse (PJ_XY xy, PJ *P); @@ -158,7 +158,7 @@ static PJ_COORD pipeline_reverse_4d (PJ_COORD point, PJ *P) { -static XYZ pipeline_forward_3d (LPZ lpz, PJ *P) { +static PJ_XYZ pipeline_forward_3d (PJ_LPZ lpz, PJ *P) { PJ_COORD point = {{0,0,0,0}}; int i; point.lpz = lpz; @@ -170,7 +170,7 @@ static XYZ pipeline_forward_3d (LPZ lpz, PJ *P) { } -static LPZ pipeline_reverse_3d (XYZ xyz, PJ *P) { +static PJ_LPZ pipeline_reverse_3d (PJ_XYZ xyz, PJ *P) { PJ_COORD point = {{0,0,0,0}}; int i; point.xyz = xyz; @@ -184,7 +184,7 @@ static LPZ pipeline_reverse_3d (XYZ xyz, PJ *P) { -static XY pipeline_forward (LP lp, PJ *P) { +static PJ_XY pipeline_forward (PJ_LP lp, PJ *P) { PJ_COORD point = {{0,0,0,0}}; int i; point.lp = lp; @@ -196,7 +196,7 @@ static XY pipeline_forward (LP lp, PJ *P) { } -static LP pipeline_reverse (XY xy, PJ *P) { +static PJ_LP pipeline_reverse (PJ_XY xy, PJ *P) { PJ_COORD point = {{0,0,0,0}}; int i; point.xy = xy; |