Merge branch 'master' into classic-tutorial

Author: dcwhite

src/Core/Persistent/Pstreams.cc

@@ -62,6 +62,7 @@
 #  include <io.h>
 #endif
 
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #pragma GCC diagnostic ignored "-Wunknown-warning-option"
 //TODO: new one from M1/Big Sur build
 #pragma GCC diagnostic ignored "-Wfortify-source"

src/Core/Utils/Legacy/FileUtils.cc

@@ -64,123 +64,6 @@ namespace bsys=boost::system;
 
 namespace SCIRun {
 
-////////////////////////////////////////////////////////////
-//
-// InsertStringInFile
-//
-//       If "match" is found in "filename", then add "add_text" text
-//       to the file _after_ the location of the matched text.
-//
-//   Normally, I would just use sed via system() to edit a file,
-//   but for some reason system() calls never work from Dataflow
-//   processes in linux.  Oh well, sed isn't natively available
-//   under windows, so I'd have to do something like this anyhow
-//   - Chris Moulding
-
-void
-InsertStringInFile(char* filename, const char* match, const char* add_text)
-{
-  /// @todo: rewrite in C++
-  char* newfilename = new char[strlen(filename)+2];
-  char c;
-  sprintf(newfilename,"%s~",filename);
-  FILE* ifile;
-  FILE* ofile;
-
-  /* create a copy of the original file */
-  ifile = fopen(filename,"r");
-
-  if( !ifile ) {
-    printf( "ERROR: In Core/Util/FileUtils.cc: InsertStringInFile:\n" );
-    printf("        File '%s' does not exist!\n", filename );
-    printf( "       There is something seriously wrong with your SCIRun installation.\n");
-    printf( "       Please contact [email protected].\n");
-    exit( 1 );
-  }
-
-  ofile = fopen(newfilename,"w");
-
-  c = (char)fgetc(ifile);
-  while (c!=(char)EOF) {
-    fprintf(ofile,"%c",c);
-    c = (char)fgetc(ifile);
-  }
-  fclose(ifile);
-  fclose(ofile);
-
-  // Search the copy for an instance of "match"...
-  int index1 = 0;
-  unsigned int index2 = 0;
-  int foundat = -1;
-  ifile = fopen(newfilename,"r");
-  c = (char)fgetc(ifile);
-  while (c!=(char)EOF) {
-    if (c==match[index2]) {
-      foundat = index1 + strlen(match);
-      while (index2<strlen(match) && c!=(char)EOF && c==match[index2]) {
-        c = (char)fgetc(ifile);
-        index1++;
-        index2++;
-      }
-      if( foundat >= 0 && index2 != strlen(match) ) {
-        foundat = -1;
-        index2 = 0;
-      } else {
-        break;
-      }
-    }
-    c = (char)fgetc(ifile);
-    index1++;
-  }
-  fclose(ifile);
-
-  // If an instance of match was found, insert the indicated string...
-  if( foundat >= 0 ) {
-    index1 = 0;
-    ifile = fopen(newfilename,"r");
-    ofile = fopen(filename,"w");
-    c = (char)fgetc(ifile);
-    while (c!=(char)EOF) {
-      if( index1 == foundat ) {
-        fprintf( ofile, "%s", add_text );
-      }
-      fprintf(ofile,"%c",c);
-      c = (char)fgetc(ifile);
-      index1++;
-    }
-    fclose(ifile);
-    fclose(ofile);
-  }
-}
-
-std::map<int,char*>*
-GetFilenamesEndingWith(const char* d, const  char* ext)
-{
-  std::map<int,char*>* newmap = nullptr;
-  dirent* file = nullptr;
-  DIR* dir = opendir(d);
-  char* newstring = nullptr;
-
-  if (!dir)
-    return nullptr;
-
-  newmap = new std::map<int,char*>;
-
-  file = readdir(dir);
-  while (file) {
-    if ((strlen(file->d_name)>=strlen(ext)) &&
-        (strcmp(&(file->d_name[strlen(file->d_name)-strlen(ext)]),ext)==0)) {
-      newstring = new char[strlen(file->d_name)+1];
-      sprintf(newstring,"%s",file->d_name);
-      newmap->insert(std::pair<int,char*>(newmap->size(),newstring));
-    }
-    file = readdir(dir);
-  }
-
-  closedir(dir);
-  return newmap;
-}
-
 std::string
 substituteTilde( const std::string & dirstr ) {
   std::string realdirstr = dirstr;

src/Core/Utils/Legacy/FileUtils.h

@@ -48,23 +48,6 @@
 
 namespace SCIRun {
 
-////////////////////////////////////
-/// InsertStringInFile()
-/// Inserts "insert" in front of all occurrances of
-/// "match" within the file named "filename"
-
-SCISHARE void InsertStringInFile(char* filename, const char* match, const char* insert);
-
-
-////////////////////////////////////
-/// GetFilenamesEndingWith()
-/// returns a std::map of strings that contains
-/// all the files with extension "ext" inside
-/// the directory named "dir"
-
-SCISHARE std::map<int,char*>* GetFilenamesEndingWith(const char* dir,
-                                                     const char* ext);
-
 SCISHARE std::vector<std::string> GetFilenamesStartingWith(const std::string & dir,
                                                       const std::string & prefix);
 

src/Graphics/Datatypes/Tests/GLMTests.cc

@@ -31,7 +31,6 @@
 #include <gtest/gtest.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
-#include <glm/gtx/string_cast.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec3.hpp>
 

src/Interface/Modules/Render/ES/ObjectTransformCalculators.cc

@@ -29,7 +29,6 @@
 #include <Interface/Modules/Render/ES/ObjectTransformCalculators.h>
 #include <Interface/Modules/Render/ES/SRCamera.h>
 #include <glm/gtx/transform.hpp>
-#include <glm/gtx/string_cast.hpp>
 #include <Core/Math/MiscMath.h>
 #include <glm/gtx/vec_swizzle.hpp>
 

src/Modules/Visualization/ShowColorMapModule.cc

@@ -200,13 +200,13 @@ GeometryBaseHandle ShowColorMap::buildGeometryObject(ColorMapHandle cm, ModuleSt
 
   auto geom(makeShared<GeometryObjectSpire>(*this, idname, false));
 
-  //geom->setColorMap(cm->getColorMapName());
   geom->ibos().push_back(geomIBO);
   geom->vbos().push_back(geomVBO);
   geom->passes().push_back(pass);
 
   //text
-  char str2[128];
+  constexpr int valueBufferSize = 128;
+  char str2[valueBufferSize];
   std::stringstream sd;
   sd << "%." << sigdig << "g";
   std::vector<Vector> txt_coords;
@@ -226,7 +226,8 @@ GeometryBaseHandle ShowColorMap::buildGeometryObject(ColorMapHandle cm, ModuleSt
   for (double i = 0.; i <= 1.000000001; i += increment)
   {
     std::stringstream lineStream;
-    sprintf(str2, sd.str().c_str(), (i / cm->getColorMapRescaleScale() - cm->getColorMapRescaleShift()) * scale);
+    const double colorValue = (i / cm->getColorMapRescaleScale() - cm->getColorMapRescaleShift()) * scale;
+    snprintf(str2, valueBufferSize, sd.str().c_str(), colorValue);
     lineStream << str2 << " " << state->getValue(Units).toString();
     const auto line = lineStream.str();
     bool ds = displaySide == 0;