diff options
author | Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> | 2018-07-31 14:13:20 +0200 |
---|---|---|
committer | Bas Couwenberg <sebastic@debian.org> | 2018-07-31 14:13:20 +0200 |
commit | 1a8efd6ac60bff38fd9fc5e3d36933420916e082 (patch) | |
tree | 95b081e289fd41207659af9d1f6c0053aedfa107 /src/FYBA/FYLR.cpp | |
parent | efa9679a7f55dcce8b5000dc9a776a02eae3ad68 (diff) |
fix_issue
Gbp-Pq: Name fix_issue.patch
Diffstat (limited to 'src/FYBA/FYLR.cpp')
-rw-r--r-- | src/FYBA/FYLR.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/FYBA/FYLR.cpp b/src/FYBA/FYLR.cpp index a56879e..fc5de96 100644 --- a/src/FYBA/FYLR.cpp +++ b/src/FYBA/FYLR.cpp @@ -141,10 +141,10 @@ void LR_Indx(void) // Spesialhandtering av ulogiske sirkler og buer. Håndteres som KURVE
for (pt=0; pt<Sys.pGrInfo->nko; pt++) {
- min_a = min(min_a,*(Sys.pdAust + pt));
- min_n = min(min_n,*(Sys.pdNord + pt));
- max_a = max(max_a,*(Sys.pdAust + pt));
- max_n = max(max_n,*(Sys.pdNord + pt));
+ min_a = fymin(min_a,*(Sys.pdAust + pt));
+ min_n = fymin(min_n,*(Sys.pdNord + pt));
+ max_a = fymax(max_a,*(Sys.pdAust + pt));
+ max_n = fymax(max_n,*(Sys.pdNord + pt));
}
}
@@ -152,10 +152,10 @@ void LR_Indx(void) } else {
/* Omskreven firkant */
for (pt=0; pt<Sys.pGrInfo->nko; pt++) {
- min_a = min(min_a,*(Sys.pdAust + pt));
- min_n = min(min_n,*(Sys.pdNord + pt));
- max_a = max(max_a,*(Sys.pdAust + pt));
- max_n = max(max_n,*(Sys.pdNord + pt));
+ min_a = fymin(min_a,*(Sys.pdAust + pt));
+ min_n = fymin(min_n,*(Sys.pdNord + pt));
+ max_a = fymax(max_a,*(Sys.pdAust + pt));
+ max_n = fymax(max_n,*(Sys.pdNord + pt));
}
}
@@ -412,10 +412,10 @@ void LR_IndxFlate(void) for (s=0; s<ant_ref; s++) {
pRL = LI_GetGeo(pFi,ref_arr[s]);
if (pRL != NULL) {
- min_a = min(min_a, pRL->Boks.dMinAust);
- min_n = min(min_n, pRL->Boks.dMinNord);
- max_a = max(max_a, pRL->Boks.dMaxAust);
- max_n = max(max_n, pRL->Boks.dMaxNord);
+ min_a = fymin(min_a, pRL->Boks.dMinAust);
+ min_n = fymin(min_n, pRL->Boks.dMinNord);
+ max_a = fymax(max_a, pRL->Boks.dMaxAust);
+ max_n = fymax(max_n, pRL->Boks.dMaxNord);
}
}
@@ -1857,10 +1857,10 @@ CD ======================================================================= */
static void LR_R_BoksSum(LC_BOKS * pB1,LC_BOKS * pB2)
{
- pB1->dMinAust = min(pB1->dMinAust,pB2->dMinAust);
- pB1->dMinNord = min(pB1->dMinNord,pB2->dMinNord);
- pB1->dMaxAust = max(pB1->dMaxAust,pB2->dMaxAust);
- pB1->dMaxNord = max(pB1->dMaxNord,pB2->dMaxNord);
+ pB1->dMinAust = fymin(pB1->dMinAust,pB2->dMinAust);
+ pB1->dMinNord = fymin(pB1->dMinNord,pB2->dMinNord);
+ pB1->dMaxAust = fymax(pB1->dMaxAust,pB2->dMaxAust);
+ pB1->dMaxNord = fymax(pB1->dMaxNord,pB2->dMaxNord);
}
@@ -1886,8 +1886,8 @@ static double LR_BoksDeltaArealSum(LC_BOKS * pB1,LC_BOKS * pB2) //lGml = (pB1->dMaxAust - pB1->dMinAust) * (pB1->dMaxNord - pB1->dMinNord);
//return (lNy - lGml);
- double dDeltaAreal = (max(pB1->dMaxAust,pB2->dMaxAust) - min(pB1->dMinAust,pB2->dMinAust)) *
- (max(pB1->dMaxNord,pB2->dMaxNord) - min(pB1->dMinNord,pB2->dMinNord));
+ double dDeltaAreal = (fymax(pB1->dMaxAust,pB2->dMaxAust) - fymin(pB1->dMinAust,pB2->dMinAust)) *
+ (fymax(pB1->dMaxNord,pB2->dMaxNord) - fymin(pB1->dMinNord,pB2->dMinNord));
return dDeltaAreal;
}
|