summaryrefslogtreecommitdiff
path: root/src/FYBA/FYLO.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/FYBA/FYLO.cpp')
-rw-r--r--src/FYBA/FYLO.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/FYBA/FYLO.cpp b/src/FYBA/FYLO.cpp
index 21291d7..45fc58b 100644
--- a/src/FYBA/FYLO.cpp
+++ b/src/FYBA/FYLO.cpp
@@ -1598,10 +1598,10 @@ SK_EntPnt_FYBA void LC_CloseSos(LC_FILADM *pFil,short s_stat)
if (pFil->usLag & (LC_FRAMGR | LC_BAKGR)) {
/* Filen inneholder data */
if (pFil->pGeoRN != NULL) {
- pB->dMinAust = min(pB->dMinAust,pFil->Omraade.dMinAust);
- pB->dMinNord = min(pB->dMinNord,pFil->Omraade.dMinNord);
- pB->dMaxAust = max(pB->dMaxAust,pFil->Omraade.dMaxAust);
- pB->dMaxNord = max(pB->dMaxNord,pFil->Omraade.dMaxNord);
+ pB->dMinAust = fymin(pB->dMinAust,pFil->Omraade.dMinAust);
+ pB->dMinNord = fymin(pB->dMinNord,pFil->Omraade.dMinNord);
+ pB->dMaxAust = fymax(pB->dMaxAust,pFil->Omraade.dMaxAust);
+ pB->dMaxNord = fymax(pB->dMaxNord,pFil->Omraade.dMaxNord);
}
}
pFil = pFil->pNesteFil;
@@ -1789,10 +1789,10 @@ SK_EntPnt_FYBA short LC_GetBaOm(unsigned short usLag,double *nva,double *nvn,dou
while (LC_NextFil(&pFil,usLag)) {
sAntall++;
if (LC_GetFiOm(pFil,&na,&nn,&oa,&on)) {
- *nva = min (*nva, na);
- *nvn = min (*nvn, nn);
- *oha = max (*oha, oa);
- *ohn = max (*ohn, on);
+ *nva = fymin(*nva, na);
+ *nvn = fymin(*nvn, nn);
+ *oha = fymax(*oha, oa);
+ *ohn = fymax(*ohn, on);
}
}
@@ -2034,10 +2034,10 @@ static short LO_InklSos(LC_FILADM *pFil,short sVisStatus)
if (pFil->usLag & (LC_FRAMGR | LC_BAKGR)) {
/* Filen inneholder data */
if (pFil->pGeoRN != NULL) {
- pB->dMinAust = min(pB->dMinAust,pFil->Omraade.dMinAust);
- pB->dMinNord = min(pB->dMinNord,pFil->Omraade.dMinNord);
- pB->dMaxAust = max(pB->dMaxAust,pFil->Omraade.dMaxAust);
- pB->dMaxNord = max(pB->dMaxNord,pFil->Omraade.dMaxNord);
+ pB->dMinAust = fymin(pB->dMinAust,pFil->Omraade.dMinAust);
+ pB->dMinNord = fymin(pB->dMinNord,pFil->Omraade.dMinNord);
+ pB->dMaxAust = fymax(pB->dMaxAust,pFil->Omraade.dMaxAust);
+ pB->dMaxNord = fymax(pB->dMaxNord,pFil->Omraade.dMaxNord);
}
}
pFil = pFil->pNesteFil;