Skip to content

Commit 8d0c3c4

Browse files
committed
Removed from CmsAnnotation.cc
1 parent 95e6b73 commit 8d0c3c4

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Fireworks/Core/src/CmsAnnotation.cc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,15 @@ Bool_t CmsAnnotation::Handle(TGLRnrCtx& rnrCtx, TGLOvlSelectRecord& selRec, Even
262262
else if (fPosY > 1.0f)
263263
fPosY = 1.0f;
264264
} else {
265-
using namespace std;
266265
Float_t oovpw = 1.0f / vp.Width(), oovph = 1.0f / vp.Height();
267266

268-
Float_t xw = oovpw * min(max(0, event->fX), vp.Width());
269-
Float_t yw = oovph * min(max(0, vp.Height() - event->fY), vp.Height());
267+
Float_t xw = oovpw * std::min(std::max(0, event->fX), vp.Width());
268+
Float_t yw = oovph * std::min(std::max(0, vp.Height() - event->fY), vp.Height());
270269

271-
Float_t rx = max((xw - fPosX) / (oovpw * fMouseX - fPosX), 0.0f);
272-
Float_t ry = max((yw - fPosY) / (oovph * (vp.Height() - fMouseY) - fPosY), 0.0f);
270+
Float_t rx = std::max((xw - fPosX) / (oovpw * fMouseX - fPosX), 0.0f);
271+
Float_t ry = std::max((yw - fPosY) / (oovph * (vp.Height() - fMouseY) - fPosY), 0.0f);
273272

274-
fSize = max(fSizeDrag * min(rx, ry), 0.01f);
273+
fSize = std::max(fSizeDrag * std::min(rx, ry), 0.01f);
275274
}
276275
}
277276
return kTRUE;

0 commit comments

Comments
 (0)