Skip to content

Commit 93bee75

Browse files
committed
Updated if tests for bool vs int variables
- Applies to igh and igh_o
1 parent 5abdf10 commit 93bee75

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/projections/igh.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static PJ_LP igh_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse
115115
else z = 12; /* 12 */
116116
}
117117

118-
if (z) {
118+
if (z >= 1) {
119119
bool ok = false;
120120

121121
xy.x -= Q->pj[z-1]->x0;
@@ -143,11 +143,11 @@ static PJ_LP igh_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse
143143
case 11: ok = (lp.lam >= -d20-EPSLN && lp.lam <= d80+EPSLN); break;
144144
case 12: ok = (lp.lam >= d80-EPSLN && lp.lam <= d180+EPSLN); break;
145145
}
146-
z = (!ok? 0: z); /* projectable? */
146+
z = (!ok? false: z); /* projectable? */
147147
}
148148

149-
if (!z) lp.lam = HUGE_VAL;
150-
if (!z) lp.phi = HUGE_VAL;
149+
if (z == 0) lp.lam = HUGE_VAL;
150+
if (z == 0) lp.phi = HUGE_VAL;
151151

152152
return lp;
153153
}

src/projections/igh_o.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ static PJ_LP igh_o_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, invers
125125
else z = 12;
126126
}
127127

128-
if (z) {
128+
if (z >= 1) {
129129
bool ok = false;
130130

131131
xy.x -= Q->pj[z-1]->x0;
@@ -153,11 +153,11 @@ static PJ_LP igh_o_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, invers
153153
case 12: ok = (lp.lam >= d90-EPSLN && lp.lam <= d180+EPSLN); break;
154154

155155
}
156-
z = (!ok? 0: z); /* projectable? */
156+
z = (!ok? false: z); /* projectable? */
157157
}
158158

159-
if (!z) lp.lam = HUGE_VAL;
160-
if (!z) lp.phi = HUGE_VAL;
159+
if (z == 0) lp.lam = HUGE_VAL;
160+
if (z == 0) lp.phi = HUGE_VAL;
161161

162162
return lp;
163163
}

0 commit comments

Comments
 (0)