Changeset 5151 for geovis/trunk/Renderer.cpp

Timestamp:

Mar 18, 2015, 7:59:09 AM (10 years ago)

Author:

ldelgass

Message:

Delete colormap files in ~Renderer

File:

• geovis/trunk/Renderer.cpp (modified) (2 diffs)

geovis/trunk/Renderer.cpp

@@ -143 +143 @@
     TRACE("Enter");
 
+    // Removes temp files
+    deleteColorMap("all");
+
     // Cache is deleted in main() to allow ref-counted objects to
     // be deleted and threads to exit first
@@ -258 +261 @@
 
     do {
-        if (itr->first.compare("default") == 0 ||
-            itr->first.compare("grayDefault") == 0) {
-            if (id.compare("all") != 0) {
-                WARN("Cannot delete a default color map");
-            }
-            continue;
-        }
-
         TRACE("Deleting ColorMap %s", itr->first.c_str());
+        std::string path = getColorMapFilePath(itr->first);
+        if (remove(path.c_str()) < 0) {
+            ERROR("Failed to delete colormap file '%s': %s",
+                  path.c_str(), strerror(errno));
+        }
         itr = _colorMaps.erase(itr);
     } while (doAll && itr != _colorMaps.end());