aboutsummaryrefslogtreecommitdiff
path: root/src/proj.c
diff options
context:
space:
mode:
authorThomas Knudsen <busstoptaktik@users.noreply.github.com>2018-02-01 10:22:08 +0100
committerGitHub <noreply@github.com>2018-02-01 10:22:08 +0100
commit8f3345f39afedc3b025613852a54248f170a1b9f (patch)
tree58772da8e08b8cc79eb42a192ff556482c43c7f4 /src/proj.c
parent34917e08075c056213ec651bb9a523c1f023446d (diff)
parent52c20a2e095c63fab6e4158c92b8995d882cbe62 (diff)
downloadPROJ-8f3345f39afedc3b025613852a54248f170a1b9f.tar.gz
PROJ-8f3345f39afedc3b025613852a54248f170a1b9f.zip
Merge pull request #731 from busstoptaktik/4D-API_cs2cs-style
[WIP] 4D API cs2cs style
Diffstat (limited to 'src/proj.c')
-rw-r--r--src/proj.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/proj.c b/src/proj.c
index 1d702ea4..1c86854e 100644
--- a/src/proj.c
+++ b/src/proj.c
@@ -152,12 +152,12 @@ static void process(FILE *fid) {
}
} else { /* x-y or decimal degree ascii output, scale if warranted by output units */
if (inverse) {
- if (Proj->left == PJ_IO_UNITS_RADIANS) {
+ if (Proj->left == PJ_IO_UNITS_ANGULAR) {
data.uv.v *= RAD_TO_DEG;
data.uv.u *= RAD_TO_DEG;
}
} else {
- if (Proj->right == PJ_IO_UNITS_RADIANS) {
+ if (Proj->right == PJ_IO_UNITS_ANGULAR) {
data.uv.v *= RAD_TO_DEG;
data.uv.u *= RAD_TO_DEG;
}
@@ -262,7 +262,7 @@ static void vprocess(FILE *fid) {
}
/* apply rad->deg scaling in case the output from a pipeline has degrees as units */
- if (!inverse && Proj->right == PJ_IO_UNITS_RADIANS) {
+ if (!inverse && Proj->right == PJ_IO_UNITS_ANGULAR) {
dat_xy.x *= RAD_TO_DEG;
dat_xy.y *= RAD_TO_DEG;
}