aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pj_init.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/pj_init.c b/src/pj_init.c
index 0cdfcc4d..62dea1f2 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -627,12 +627,22 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
s = pj_units[i].to_meter;
}
if (s || (s = pj_param(ctx, start, "sto_meter").s)) {
- PIN->to_meter = pj_strtod(s, &s);
- if (*s == '/') /* ratio number */
- PIN->to_meter /= pj_strtod(++s, 0);
- if (PIN->to_meter <= 0.0)
+ double factor;
+ int ratio = 0;
+
+ /* ratio number? */
+ if (*s == '/') {
+ ratio = 1;
+ s++;
+ }
+
+ factor = pj_strtod(s, &s);
+ if ((factor <= 0.0) || (1/factor==0))
return pj_default_destructor (PIN, PJD_ERR_UNIT_FACTOR_LESS_THAN_0);
- PIN->fr_meter = 1. / PIN->to_meter;
+
+ PIN->to_meter = ratio? 1 / factor: factor;
+ PIN->fr_meter = 1 / PIN->to_meter;
+
} else
PIN->to_meter = PIN->fr_meter = 1.;