Solve additional code issues

qgis · Jul 16, 2019 · 331c67e · 331c67e
1 parent a51fbd6
commit 331c67e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/core/qgsunittypes.cpp b/src/core/qgsunittypes.cpp
@@ -1233,6 +1233,8 @@ QString QgsUnitTypes::toString( QgsUnitTypes::AngleUnit unit )
       return QObject::tr( "seconds of arc", "angle" );
     case AngleTurn:
       return QObject::tr( "turns", "angle" );
+    case AngleMil:
+      return QObject::tr( "mil", "angle" );
     case AngleUnknownUnit:
       return QObject::tr( "<unknown>", "angle" );
   }

diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -536,7 +536,7 @@ void QgsRubberBand::updateRect()
   if ( mSvgRenderer )
   {
     QRectF viewBox = mSvgRenderer->viewBoxF();
-    iconSize = qMax( std::fabs( mSvgOffset.x() ) + .5 * viewBox.width(), std::fabs( mSvgOffset.y() ) + .5 * viewBox.height() );
+    iconSize = std::max( std::fabs( mSvgOffset.x() ) + .5 * viewBox.width(), std::fabs( mSvgOffset.y() ) + .5 * viewBox.height() );
   }
 
   qreal w = ( ( mIconSize - 1 ) / 2 + mPen.width() ); // in canvas units