From 5a312fd4a37ba0dd0eff982d6076f0e5b1e7a9da Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 15 Oct 2010 10:27:45 +0000
Subject: [PATCH] fix warnings
---
Fltk/optionWindow.cpp | 2 +-
Fltk/partitionDialog.cpp | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 17b8e86001..3a079b2dea 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -554,7 +554,7 @@ static void view_options_ok_cb(Fl_Widget *w, void *data)
int vindex = o->view.index;
if(vindex >= 0 && vindex < (int)PView::list.size()){
// compute min/max taking current visibility status into account
- int step = opt_view_timestep(vindex, GMSH_GET, 0);
+ int step = (int)opt_view_timestep(vindex, GMSH_GET, 0);
if(!strcmp(str, "range_min"))
o->view.value[31]->value
(PView::list[vindex]->getData(true)->getMin(step, true));
diff --git a/Fltk/partitionDialog.cpp b/Fltk/partitionDialog.cpp
index ffd16814ca..ffa8a12f5c 100644
--- a/Fltk/partitionDialog.cpp
+++ b/Fltk/partitionDialog.cpp
@@ -124,12 +124,12 @@ struct PartitionDialog
CTX::instance()->partitionOptions.edge_matching = choiceEdgeMatch->value() + 1;
CTX::instance()->partitionOptions.refine_algorithm = choiceRefineAlg->value() + 1;
- CTX::instance()->partitionOptions.triWeight = inputTriWeight->value();
- CTX::instance()->partitionOptions.quaWeight = inputQuaWeight->value();
- CTX::instance()->partitionOptions.tetWeight = inputTetWeight->value();
- CTX::instance()->partitionOptions.priWeight = inputPriWeight->value();
- CTX::instance()->partitionOptions.pyrWeight = inputPyrWeight->value();
- CTX::instance()->partitionOptions.hexWeight = inputHexWeight->value();
+ CTX::instance()->partitionOptions.triWeight = (int)inputTriWeight->value();
+ CTX::instance()->partitionOptions.quaWeight = (int)inputQuaWeight->value();
+ CTX::instance()->partitionOptions.tetWeight = (int)inputTetWeight->value();
+ CTX::instance()->partitionOptions.priWeight = (int)inputPriWeight->value();
+ CTX::instance()->partitionOptions.pyrWeight = (int)inputPyrWeight->value();
+ CTX::instance()->partitionOptions.hexWeight = (int)inputHexWeight->value();
}
void read_all_options()
--
GitLab