diff --git a/modules/geom/src/quat.cc b/modules/geom/src/quat.cc index 44e39ee2bb71d9c308d07cfb8a43ffa8403e6f8f..84fcb872a5a3deff62d114ecd15b3a734a273cc7 100644 --- a/modules/geom/src/quat.cc +++ b/modules/geom/src/quat.cc @@ -133,9 +133,9 @@ Vec3 find_orthogonal_vector(const Vec3& xyz) //if (vecnormsqr <= numeric_limits<Real>::epsilon()) Real components[3] = { - fabs(xyz[0]), - fabs(xyz[1]), - fabs(xyz[2]) + std::abs<Real>(xyz[0]), + std::abs<Real>(xyz[1]), + std::abs<Real>(xyz[2]) }; Real* where = ::std::min_element(components, components+3); diff --git a/modules/gui/src/data_viewer/data_viewer_panel_base.cc b/modules/gui/src/data_viewer/data_viewer_panel_base.cc index eb53154eef140a11ab9d215ab5a5137ce0127821..dd968c6b6616fd9e46b19674bb26bf34f27ea731 100644 --- a/modules/gui/src/data_viewer/data_viewer_panel_base.cc +++ b/modules/gui/src/data_viewer/data_viewer_panel_base.cc @@ -478,7 +478,6 @@ void DataViewerPanelBase::mousePressEvent(QMouseEvent* event) rubberband_->hide(); last_x_=event->x(); last_y_=event->y(); - QPoint cp=FracPointToWin(geom::Vec2(clicked_position_)); clicked_position_ = geom::Vec3(WinToFracPoint(QPoint(event->x(),event->y()))); clicked_position_[2]=slab_; emit clicked(clicked_position_); diff --git a/modules/img/alg/src/fft.cc b/modules/img/alg/src/fft.cc index a924a0fe6ace8e5199ea31a04c664ddbe43194d7..ddc137d1a5272ee98d091b211458ce3791f0c7c7 100644 --- a/modules/img/alg/src/fft.cc +++ b/modules/img/alg/src/fft.cc @@ -258,7 +258,7 @@ ImageStateBasePtr FFTFnc::VisitState<Complex,SpatialDomain>(const ComplexSpatial out_state->Data()=in_state.Data(); // use assignement op to copy data area to new state int rank = size.GetDim(); - int n[3] = {size[0],size[1],size[2]}; + int n[3] = {static_cast<int>(size[0]),static_cast<int>(size[1]),static_cast<int>(size[2])}; int dir = FFTW_FORWARD; assert(sizeof(OST_FFTW_fftw_complex)==sizeof(Complex)); @@ -297,7 +297,7 @@ ImageStateBasePtr FFTFnc::VisitState<Complex,FrequencyDomain>(const ComplexFrequ out_state->SetAbsoluteOrigin(in_state.GetAbsoluteOrigin()); int rank = size.GetDim(); - int n[3] = {size[0],size[1],size[2]}; + int n[3] = {static_cast<int>(size[0]),static_cast<int>(size[1]),static_cast<int>(size[2])}; int dir = FFTW_BACKWARD; assert(sizeof(OST_FFTW_fftw_complex)==sizeof(Complex)); diff --git a/modules/io/src/img/map_io_mrc_handler.cc b/modules/io/src/img/map_io_mrc_handler.cc index 55d4f69138c1e48b90d797f2c3aefe31b2b8efe2..b49e976eca8e9d1b45aa24b8cffa347934fb8dfe 100644 --- a/modules/io/src/img/map_io_mrc_handler.cc +++ b/modules/io/src/img/map_io_mrc_handler.cc @@ -698,7 +698,6 @@ void real_dumper(BinaryOStream<CONVERSIONTYPE>& f, header_base& header, const Co img::Point pnt; char this_dummy; //create dummy variable to give to Progress as this Progress::Instance().Register(&this_dummy,header.ns*header.nr,100); - Point start=image.GetExtent().GetStart(); for(int ss=0;ss<header.ns;++ss) { pnt[maps]=header.nsstart+ss; for(int sr=0;sr<header.nr;++sr) {