FLTK logo

[master] 753631a - Fix MSVC compiler warnings (PR #267)

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 753631a - Fix MSVC compiler warnings (PR #267) "fire-eggs" Aug 30, 2021  
 
commit 753631a0b57ba417701167d1e4dd24df0b923254
Author:     fire-eggs <lifeattickville@gmail.com>
AuthorDate: Mon Aug 30 10:51:29 2021 -0400
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Mon Aug 30 22:13:32 2021 +0200

    Fix MSVC compiler warnings (PR #267)

 examples/shapedwindow.cxx                        |  8 ++++----
 examples/table-spreadsheet-with-keyboard-nav.cxx |  2 +-
 examples/table-spreadsheet.cxx                   |  2 +-
 test/animated.cxx                                | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git examples/shapedwindow.cxx examples/shapedwindow.cxx
index cbc80f2..b06a6c0 100644
--- examples/shapedwindow.cxx
+++ examples/shapedwindow.cxx
@@ -52,13 +52,13 @@ public:
   }
 };
 
-const float factor = 1.3;
+const float factor = 1.3f;
 
 void shrink(Fl_Widget *wdgt, void *data)
 {
   Fl_Window *win = wdgt->window();
   int old = win->w();
-  win->size(old/factor, old/factor);
+  win->size(int(old/factor), int(old/factor));
   if (win->w() <= *(int*)data) wdgt->deactivate();
 }
 
@@ -66,7 +66,7 @@ void enlarge(Fl_Widget *wdgt, void *data)
 {
   Fl_Window *win = wdgt->window();
   int old = win->w();
-  win->size(old*factor, old*factor);
+  win->size(int(old*factor), int(old*factor));
   ((Fl_Widget*)data)->activate();
 }
 
@@ -80,7 +80,7 @@ Fl_RGB_Image* prepare_shape(int w)
   fl_color(FL_WHITE);
   fl_pie(2,2,w-4,w-4,0,360);
   fl_color(FL_BLACK);
-  fl_pie(0.7*w,w/2,w/4,w/4,0,360);
+  fl_pie(int(0.7*w),w/2,w/4,w/4,0,360);
   Fl_RGB_Image* img = surf->image();
   delete surf;
   Fl_Surface_Device::pop_current();
diff --git examples/table-spreadsheet-with-keyboard-nav.cxx examples/table-spreadsheet-with-keyboard-nav.cxx
index 66273ce..ec8714d 100644
--- examples/table-spreadsheet-with-keyboard-nav.cxx
+++ examples/table-spreadsheet-with-keyboard-nav.cxx
@@ -102,7 +102,7 @@ public:
     input->resize(X,Y,W,H);                             // Move Fl_Input widget there
     char s[30]; sprintf(s, "%d", values[R][C]);         // Load input widget with cell's current value
     input->value(s);
-    input->position(0,strlen(s));                       // Select entire input field
+    input->position(0,int(strlen(s)));                  // Select entire input field
     input->show();                                      // Show the input widget, now that we've positioned it
     input->take_focus();
   }
diff --git examples/table-spreadsheet.cxx examples/table-spreadsheet.cxx
index 94a4112..ac7c334 100644
--- examples/table-spreadsheet.cxx
+++ examples/table-spreadsheet.cxx
@@ -79,7 +79,7 @@ public:
     input->resize(X,Y,W,H);                             // Move Fl_Input widget there
     char s[30]; sprintf(s, "%d", values[R][C]);         // Load input widget with cell's current value
     input->value(s);
-    input->position(0,strlen(s));                       // Select entire input field
+    input->position(0, int(strlen(s)));                 // Select entire input field
     input->show();                                      // Show the input widget, now that we've positioned it
     input->take_focus();                                // Put keyboard focus into the input widget
   }
diff --git test/animated.cxx test/animated.cxx
index 1d7680c..7147997 100644
--- test/animated.cxx
+++ test/animated.cxx
@@ -53,9 +53,9 @@ static void make_images() {
     // A fading sphere
     uchar alpha = 255;
     if (i < FRAMES / 2)
-      alpha = 255 * (i / ((float) FRAMES / 2));
+      alpha = uchar(255 * (i / ((float) FRAMES / 2)));
     else
-      alpha = 255 * (((FRAMES / 2) - (i - FRAMES / 2)) / ((float) FRAMES / 2));
+      alpha = uchar(255 * (((FRAMES / 2) - (i - FRAMES / 2)) / ((float) FRAMES / 2)));
 
     const int spherew = 60;
     const int spherex = (DIM - spherew) / 2;
@@ -71,11 +71,11 @@ static void make_images() {
           continue;
 
         const float fill = dist / maxdist;
-        const uchar grey = fill * 255;
+        const uchar grey = uchar(fill * 255);
 
         uchar myalpha = alpha;
         if (fill > 0.9)
-          myalpha *= (1.0f - fill) * 10;
+          myalpha *= uchar((1.0f - fill) * 10);
 
         data[y * DIM * 4 + x * 4 + 0] = grey;
         data[y * DIM * 4 + x * 4 + 1] = grey;
@@ -85,9 +85,9 @@ static void make_images() {
     }
 
     // A moving blob
-    const float pos = (i / (float) FRAMES) * 2 - 0.5;
+    const float pos = (i / (float) FRAMES) * 2 - 0.5f;
 
-    const int xoffset = pos * DIM;
+    const int xoffset = int(pos * DIM);
     const int yoffset = 2 * DIM / 3;
     const int w = DIM / 4;
 
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.