Skip to content

Commit 967d0ea

Browse files
JBlaschkeJBlaschke
committed
fix 'abs' -> 'std:abs'
1 parent 0adc266 commit 967d0ea

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎PltApp.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,8 +3618,8 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
36183618
case MotionNotify:
36193619

36203620
if(rectDrawn) { // undraw the old rectangle(s)
3621-
rWidth = abs(oldX-anchorX);
3622-
rHeight = abs(oldY-anchorY);
3621+
rWidth = std::abs(oldX-anchorX);
3622+
rHeight = std::abs(oldY-anchorY);
36233623
rStartX = (anchorX < oldX) ? anchorX : oldX;
36243624
rStartY = (anchorY < oldY) ? anchorY : oldY;
36253625
XDrawRectangle(display, amrPicturePtrArray[V]->PictureWindow(),
@@ -3630,30 +3630,30 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
36303630
case Amrvis::ZPLANE:
36313631
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
36323632
rbgc, rStartX, startcutY[Amrvis::YPLANE], rWidth,
3633-
abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
3633+
std::abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
36343634
rStartPlane = (anchorY < oldY) ? oldY : anchorY;
36353635
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
36363636
rbgc, imageHeight-rStartPlane, startcutY[Amrvis::XPLANE],
36373637
rHeight,
3638-
abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
3638+
std::abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
36393639
break;
36403640
case Amrvis::YPLANE:
36413641
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
36423642
rbgc, rStartX, startcutY[Amrvis::ZPLANE], rWidth,
3643-
abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
3643+
std::abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
36443644
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
36453645
rbgc, startcutX[Amrvis::XPLANE], rStartY,
3646-
abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]),
3646+
std::abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]),
36473647
rHeight);
36483648
break;
36493649
default: // Amrvis::XPLANE
36503650
rStartPlane = (anchorX < oldX) ? oldX : anchorX;
36513651
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
36523652
rbgc, startcutX[Amrvis::ZPLANE], imageWidth-rStartPlane,
3653-
abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
3653+
std::abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
36543654
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
36553655
rbgc, startcutX[Amrvis::YPLANE], rStartY,
3656-
abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]),
3656+
std::abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]),
36573657
rHeight);
36583658
}
36593659
#endif
@@ -3677,8 +3677,8 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
36773677
}
36783678
newX = max(0, min(imageWidth, newX));
36793679
newY = max(0, min(imageHeight, newY));
3680-
rWidth = abs(newX-anchorX); // draw the new rectangle
3681-
rHeight = abs(newY-anchorY);
3680+
rWidth = std::abs(newX-anchorX); // draw the new rectangle
3681+
rHeight = std::abs(newY-anchorY);
36823682
rStartX = (anchorX < newX) ? anchorX : newX;
36833683
rStartY = (anchorY < newY) ? anchorY : newY;
36843684
XDrawRectangle(display, amrPicturePtrArray[V]->PictureWindow(),
@@ -3703,12 +3703,12 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
37033703
// draw in other planes
37043704
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
37053705
rbgc, rStartX, startcutY[Amrvis::YPLANE], rWidth,
3706-
abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
3706+
std::abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
37073707
rStartPlane = (anchorY < newY) ? newY : anchorY;
37083708
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
37093709
rbgc, imageHeight-rStartPlane, startcutY[Amrvis::XPLANE],
37103710
rHeight,
3711-
abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
3711+
std::abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
37123712
break;
37133713
case Amrvis::YPLANE:
37143714
startcutX[Amrvis::ZPLANE] = startcutX[V];
@@ -3717,10 +3717,10 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
37173717
finishcutY[Amrvis::XPLANE] = finishcutY[V];
37183718
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
37193719
rbgc, rStartX, startcutY[Amrvis::ZPLANE], rWidth,
3720-
abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
3720+
std::abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
37213721
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
37223722
rbgc, startcutX[Amrvis::XPLANE], rStartY,
3723-
abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]), rHeight);
3723+
std::abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]), rHeight);
37243724
break;
37253725
default: // Amrvis::XPLANE
37263726
startcutY[Amrvis::YPLANE] = startcutY[V];
@@ -3730,10 +3730,10 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
37303730
rStartPlane = (anchorX < newX) ? newX : anchorX;
37313731
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
37323732
rbgc, startcutX[Amrvis::ZPLANE], imageWidth-rStartPlane,
3733-
abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
3733+
std::abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
37343734
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
37353735
rbgc, startcutX[Amrvis::YPLANE], rStartY,
3736-
abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]), rHeight);
3736+
std::abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]), rHeight);
37373737
}
37383738

37393739
#if defined(BL_VOLUMERENDER) || defined(BL_PARALLELVOLUMERENDER)

‎XYPlotWin.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2317,8 +2317,8 @@ void XYPlotWin::CBdoRubberBanding(Widget, XtPointer, XtPointer call_data) {
23172317
case MotionNotify:
23182318

23192319
if(rectDrawn) { // undraw the old rectangle(s)
2320-
rWidth = abs(oldX-anchorX);
2321-
rHeight = abs(oldY-anchorY);
2320+
rWidth = std::abs(oldX-anchorX);
2321+
rHeight = std::abs(oldY-anchorY);
23222322
rStartX = (anchorX < oldX) ? anchorX : oldX;
23232323
rStartY = (anchorY < oldY) ? anchorY : oldY;
23242324
XDrawRectangle(disp, pWindow, rbGC, rStartX, rStartY,
@@ -2333,8 +2333,8 @@ void XYPlotWin::CBdoRubberBanding(Widget, XtPointer, XtPointer call_data) {
23332333
XQueryPointer(disp, pWindow, &whichRoot, &whichChild,
23342334
&rootX, &rootY, &newX, &newY, &inputMask);
23352335

2336-
rWidth = abs(newX-anchorX); // draw the new rectangle
2337-
rHeight = abs(newY-anchorY);
2336+
rWidth = std::abs(newX-anchorX); // draw the new rectangle
2337+
rHeight = std::abs(newY-anchorY);
23382338
rStartX = (anchorX < newX) ? anchorX : newX;
23392339
rStartY = (anchorY < newY) ? anchorY : newY;
23402340
XDrawRectangle(disp, pWindow, rbGC, rStartX, rStartY,
@@ -2350,8 +2350,8 @@ void XYPlotWin::CBdoRubberBanding(Widget, XtPointer, XtPointer call_data) {
23502350
avxGrab.ExplicitUngrab(); // giveitawaynow
23512351

23522352
// undraw rectangle
2353-
rWidth = abs(oldX-anchorX);
2354-
rHeight = abs(oldY-anchorY);
2353+
rWidth = std::abs(oldX-anchorX);
2354+
rHeight = std::abs(oldY-anchorY);
23552355
rStartX = (anchorX < oldX) ? anchorX : oldX;
23562356
rStartY = (anchorY < oldY) ? anchorY : oldY;
23572357
XDrawRectangle(disp, pWindow, rbGC, rStartX, rStartY,

0 commit comments

Comments
 (0)