squash a -Wfloat-conversion warning

diff --git a/cmd/smyrna/glmotion.c b/cmd/smyrna/glmotion.c
index 0d39a1e807caed6ba78ce0f3cea2ec9b70f3ac4e..09a128f4c2bacfa671873b22a73fb6024e274cba 100644 (file)
--- a/cmd/smyrna/glmotion.c
+++ b/cmd/smyrna/glmotion.c
@@ -32,7 +32,7 @@ static void graph_zoom(float real_zoom)
     if (real_zoom < view->Topview->fitin_zoom * MAX_ZOOM)
                real_zoom = (float) view->Topview->fitin_zoom * MAX_ZOOM;
     if (real_zoom > view->Topview->fitin_zoom * MIN_ZOOM)
-               real_zoom = (float) view->Topview->fitin_zoom * MIN_ZOOM;
+               real_zoom = view->Topview->fitin_zoom * MIN_ZOOM;
     if (view->active_camera == -1)
                view->zoom = real_zoom;
     else

diff --git a/cmd/smyrna/smyrnadefs.h b/cmd/smyrna/smyrnadefs.h
index 9517f934d001131b72477ced383b520ee5b805d0..abb4436da319b7ef699d099c7dd744cc403fe772 100644 (file)
--- a/cmd/smyrna/smyrnadefs.h
+++ b/cmd/smyrna/smyrnadefs.h
@@ -71,7 +71,7 @@ typedef struct _ArcBall_t ArcBall_t;
 #define GLOBAL_Z_OFFSET                        0.001
 
 #define MAX_ZOOM       500
-#define MIN_ZOOM       0.005
+#define MIN_ZOOM       0.005f
 #define ZOOM_STEPS     100
 
 #define ZOOM_STEP      0.5