Salome HOME
projects
/
modules
/
hydro.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f353f3f
)
comp.errors on linux
author
isn
<isn@opencascade.com>
Mon, 11 Dec 2017 18:53:11 +0000
(21:53 +0300)
committer
isn
<isn@opencascade.com>
Mon, 11 Dec 2017 18:53:11 +0000
(21:53 +0300)
src/HYDROData/HYDROData_DTM.cxx
patch
|
blob
|
history
diff --git
a/src/HYDROData/HYDROData_DTM.cxx
b/src/HYDROData/HYDROData_DTM.cxx
index f4fe6efab22e4c971185e987ed2750b4bf8bbb52..207530f8df59e3a0c37bc80081e3315a3197bbcc 100644
(file)
--- a/
src/HYDROData/HYDROData_DTM.cxx
+++ b/
src/HYDROData/HYDROData_DTM.cxx
@@
-99,7
+99,7
@@
HYDROData_DTM::CurveUZ HYDROData_DTM::CurveUZ::operator + ( const CurveUZ& c ) c
{
std::cout << "Warning: different number of points in curves: " << n << ", " << n1 << std::endl;
}
- int q =
min(n, n1)
;
+ int q =
n < n1 ? n : n1
;
res.reserve( q );
for( int i=0; i<q; i++ )
{
@@
-859,7
+859,7
@@
std::vector<HYDROData_Bathymetry::AltitudePoints> HYDROData_DTM::Interpolate
GetProperties( theProfileB, lowestB, dirB, zminB, zmaxB );
- double hmax =
max( zmaxA-zminA, zmaxB-zminB )
;
+ double hmax =
zmaxA-zminA > zmaxB-zminB ? zmaxA-zminA : zmaxB-zminB
;
//double dz = zminB - zminA;
//double zmin = min( zminA, zminB );