diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp index 471b79f63b79f2f274f89a73f865d38b9a1cdb6a..e8585db7182df929c3e6c35fc5eb158794169bcc 100644 --- a/Common/GmshMessage.cpp +++ b/Common/GmshMessage.cpp @@ -451,7 +451,7 @@ double Msg::GetValue(const char *text, double defaultval) if(FlGui::available()){ char defaultstr[256]; sprintf(defaultstr, "%.16g", defaultval); - const char *ret = fl_input(text, defaultstr); + const char *ret = fl_input(text, "%s", defaultstr); if(!ret) return defaultval; else @@ -469,7 +469,7 @@ double Msg::GetValue(const char *text, double defaultval) } bool Msg::GetBinaryAnswer(const char *question, const char *yes, - const char *no, bool defaultval) + const char *no, bool defaultval) { // if a callback is given let's assume we don't want to be bothered // with interactive stuff @@ -477,7 +477,7 @@ bool Msg::GetBinaryAnswer(const char *question, const char *yes, #if defined(HAVE_FLTK) if(FlGui::available()){ - if(fl_choice(question, no, yes, NULL)) + if(fl_choice(question, no, yes, NULL, "")) return true; else return false; diff --git a/Geo/MVertex.cpp b/Geo/MVertex.cpp index 396486d80a0a1026a476428f47ddda181962f4ec..c65479574bff059ea000ccc4113f49815da81e08 100644 --- a/Geo/MVertex.cpp +++ b/Geo/MVertex.cpp @@ -130,7 +130,7 @@ void MVertex::writeUNV(FILE *fp, double scalingFactor) sprintf(tmp, "%25.16E%25.16E%25.16E\n", x() * scalingFactor, y() * scalingFactor, z() * scalingFactor); for(unsigned int i = 0; i < strlen(tmp); i++) if(tmp[i] == 'E') tmp[i] = 'D'; - fprintf(fp, tmp); + fprintf(fp, "%s", tmp); } void MVertex::writeVTK(FILE *fp, bool binary, double scalingFactor, bool bigEndian) diff --git a/Graphics/drawPost.cpp b/Graphics/drawPost.cpp index a0d969ed0845f1230b6b9d2113c1ccc750fbb142..2f628034fd88574f287484ed4dedc89456af0734 100644 --- a/Graphics/drawPost.cpp +++ b/Graphics/drawPost.cpp @@ -1425,7 +1425,7 @@ class drawPView { if(opt->rangeType == PViewOptions::Custom){ opt->tmpMin = opt->customMin; - opt->tmpMax = opt->customMax; + opt->tmpMax = opt->customMax; } else if(opt->rangeType == PViewOptions::PerTimeStep){ opt->tmpMin = data->getMin(opt->timeStep); diff --git a/Post/PViewDataGModelIO.cpp b/Post/PViewDataGModelIO.cpp index 6e1253fbc0aa4ae9c93ce4f2bf58039430b727f9..334fd7bdbb60d2d231a6e2784f67bc4f76a0e707 100644 --- a/Post/PViewDataGModelIO.cpp +++ b/Post/PViewDataGModelIO.cpp @@ -503,7 +503,7 @@ bool PViewDataGModel::writeMED(std::string fileName) for(int k = 0; k < numComp; k++) val[i * numComp + k] = _steps[step]->getData(indices[i])[k]; if(MEDchampEcr(fid, meshName, fieldName, (unsigned char*)&val[0], - MED_FULL_INTERLACE, numNodes, MED_NOGAUSS, MED_ALL, + MED_FULL_INTERLACE, numNodes, (char*)MED_NOGAUSS, MED_ALL, profileName, MED_COMPACT, MED_NOEUD, MED_NONE, (med_int)step, (char*)"unknown", time, MED_NONOR) < 0) { Msg::Error("Could not write MED field");