summaryrefslogtreecommitdiff
path: root/src/FYBA/FYLI.cpp
diff options
context:
space:
mode:
authorDebian GIS Project <pkg-grass-devel@lists.alioth.debian.org>2018-07-31 14:13:20 +0200
committerBas Couwenberg <sebastic@debian.org>2018-07-31 14:13:20 +0200
commit1a8efd6ac60bff38fd9fc5e3d36933420916e082 (patch)
tree95b081e289fd41207659af9d1f6c0053aedfa107 /src/FYBA/FYLI.cpp
parentefa9679a7f55dcce8b5000dc9a776a02eae3ad68 (diff)
fix_issue
Gbp-Pq: Name fix_issue.patch
Diffstat (limited to 'src/FYBA/FYLI.cpp')
-rw-r--r--src/FYBA/FYLI.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/FYBA/FYLI.cpp b/src/FYBA/FYLI.cpp
index bbc169f..b441551 100644
--- a/src/FYBA/FYLI.cpp
+++ b/src/FYBA/FYLI.cpp
@@ -1141,8 +1141,8 @@ CD LC_EraseBt(fra_kol,til_kol);
SK_EntPnt_FYBA void LC_EraseBt(short fra_kol,short til_kol)
{
/* Beregner lovlige kolonner */
- fra_kol = max(fra_kol,BT_MIN_USER);
- til_kol = min(til_kol,BT_MAX_USER);
+ fra_kol = fymax(fra_kol,BT_MIN_USER);
+ til_kol = fymin(til_kol,BT_MAX_USER);
LI_EraseBt(fra_kol,til_kol);
}
@@ -1248,8 +1248,8 @@ void LI_EraseBt(short fra_kol,short til_kol)
LC_FILADM *pFil;
/* Beregner lovlige områder */
- fra_kol = max(fra_kol,BT_MIN_BT);
- til_kol = min(til_kol,BT_MAX_BT);
+ fra_kol = fymax(fra_kol,BT_MIN_BT);
+ til_kol = fymin(til_kol,BT_MAX_BT);
maske = 0x0000; /* Lager slettemaske */
for ( ; fra_kol <= til_kol; fra_kol++){
@@ -1302,8 +1302,8 @@ SK_EntPnt_FYBA void LC_CopyBt(short fra_kol,short til_kol,short operasjon)
unsigned long ul;
/* Beregner lovlige områder */
- fra_kol = min(max(fra_kol,0),BT_MAX_BT);
- til_kol = min(max(til_kol,0),BT_MAX_USER);
+ fra_kol = fymin(fymax(fra_kol,0),BT_MAX_BT);
+ til_kol = fymin(fymax(til_kol,0),BT_MAX_USER);
/* Returner verdi */
maske_fra = 0x00000001UL << fra_kol;