Changeset 2972 for trunk/packages/vizservers/nanovis/R2

Timestamp:

Apr 16, 2012 12:14:03 PM (12 years ago)

Author:

ldelgass

Message:

Remove vrutil library. Was only used for FilePath? that already exists in
R2 library (may need some fixing for windows portability though). Make
R2FilePath::getPath return a std::string so users can allocate a std::string
on the stack and not worry about deleting the string buffer returned. Also,
use std::string in R2Fonts to avoid leaking font names. Remove R2string as
it is now replaced by std::strings.

Location:

trunk/packages/vizservers/nanovis/R2

Files:

• include/R2/R2FilePath.h (modified) (4 diffs)
• include/R2/R2Fonts.h (modified) (2 diffs)
• include/R2/R2string.h (deleted)
• src/Makefile.in (modified) (1 diff)
• src/R2FilePath.cpp (modified) (5 diffs)
• src/R2Fonts.cpp (modified) (3 diffs)
• src/R2string.cpp (deleted)

trunk/packages/vizservers/nanovis/R2/include/R2/R2FilePath.h

@@ -4 +4 @@
 
 #include <list>
-
-#include <R2/R2string.h>
+#include <string>
 
 class R2FilePath
@@ -17 +16 @@
      * @return return full path of the file, but if not found, return ""
      */
-    const char *getPath(const char *fileName);
+    std::string getPath(const char *fileName);
 
     /**
@@ -31 +30 @@
 
 private:
-    typedef std::list<R2string> R2stringList;
-    typedef std::list<R2string>::iterator R2stringListIter;
+    typedef std::list<std::string> StringList;
+    typedef std::list<std::string>::iterator StringListIter;
 
     /// application directory
-    static R2string _curDirectory;
+    static std::string _curDirectory;
 
     /// R2FilePath instance
@@ -41 +40 @@
 
     /// all default file paths
-    R2stringList _pathList;
+    StringList _pathList;
 };
 

trunk/packages/vizservers/nanovis/R2/include/R2/R2Fonts.h

@@ -4 +4 @@
 
 #include <vector>
+#include <string>
 
 #include <R2/R2.h>
 #include <R2/R2Object.h>
-#include <R2/R2string.h>
 
 class R2Fonts : public R2Object
 {
     struct R2FontAttributes {
-        char *_fontName;
+        std::string _fontName;
         int _textureWidth;
         int _textureHeight;
@@ -29 +29 @@
         R2CharInfo _chars[256];
     };
-    
+
     typedef std::vector<R2FontAttributes>  R2FontVector;
 

trunk/packages/vizservers/nanovis/R2/src/Makefile.in

@@ -44 +44 @@
                 R2IndexBuffer.o \
                 R2Object.o \
-                R2VertexBuffer.o \
-                R2string.o
+                R2VertexBuffer.o
 
 R2LIB           = R2.a

trunk/packages/vizservers/nanovis/R2/src/R2FilePath.cpp

@@ -13 +13 @@
 #include "Trace.h"
 
-R2string R2FilePath::_curDirectory;
+std::string R2FilePath::_curDirectory;
 R2FilePath R2FilePath::_instance;
 
-char seps[] = ":";
+static char seps[] = ":";
 
 R2FilePath::R2FilePath()
@@ -22 +22 @@
     char buff[BUFSIZ+2];
 #ifdef _WIN32
-    _getcwd(buff, 255);
+    _getcwd(buff, sizeof(buff)-1);
 #else
-    if (getcwd(buff, BUFSIZ) == NULL) {
+    if (getcwd(buff, sizeof(buff)-1) == NULL) {
         ERROR("can't get current working directory\n");
     }
@@ -37 +37 @@
 R2FilePath::setPath(const char *filePath)
 {
-    char buff[255];
+    char buff[256];
 
     if (filePath == NULL) {
@@ -55 +55 @@
         if (*p == '/') {
             if (*last == '/' || *last == '\\') {
-                _pathList.push_back(R2string(p));
+                _pathList.push_back(std::string(p));
             } else {
-                _pathList.push_back(R2string(p) + "/");
+                _pathList.push_back(std::string(p) + "/");
             }
         } else {
             if (*last == '/' || *last == '\\') {
-                _pathList.push_back(_curDirectory + R2string(p));
+                _pathList.push_back(_curDirectory + std::string(p));
             } else {
-                _pathList.push_back(_curDirectory + R2string(p) + "/");
+                _pathList.push_back(_curDirectory + std::string(p) + "/");
             }
         }
@@ -76 +76 @@
 }
 
-const char *
+std::string
 R2FilePath::getPath(const char* fileName)
 {
-    R2string path;
+    std::string path;
 
-    R2stringListIter iter;
-    int nameLength = strlen(fileName);
-    for (iter = _pathList.begin(); iter != _pathList.end(); ++iter) {
-        char *path;
+    for (StringListIter iter = _pathList.begin();
+         iter != _pathList.end(); ++iter) {
+        path = *iter + std::string(fileName);
 
-        path = new char[strlen((char *)(*iter)) + 1 + nameLength + 1];
-        //sprintf(path, "%s/%s", (char *)(*iter), fileName);
-        sprintf(path, "%s%s", (char *)(*iter), fileName);
-        if (access(path, R_OK) == 0) {
+        if (access(path.c_str(), R_OK) == 0) {
             return path;
+        } else {
+            path = "";
         }
-        delete [] path;
     }
-    return NULL;
+    return path;
 }
 
 void 
-R2FilePath::setWorkingDirectory(int argc, const char** argv)
+R2FilePath::setWorkingDirectory(int argc, const char **argv)
 {
-    char buff[255];
+    char buff[256];
 
     strcpy(buff, argv[0]);
     for (int i = strlen(buff) - 1; i >= 0; --i) {
         if (buff[i] == '\\' || buff[i] == '/') {
-            buff[i] = '/'; 
-            buff[i + 1] = '\0'; 
+            buff[i] = '/';
+            buff[i + 1] = '\0';
             break;
         }

trunk/packages/vizservers/nanovis/R2/src/R2Fonts.cpp

@@ -34 +34 @@
         unsigned int i;
         for (i = 0; i < _fonts.size(); ++i) {
-            if (strcmp(_fonts[i]._fontName, fontName) == 0) {
+            if (strcmp(_fonts[i]._fontName.c_str(), fontName) == 0) {
                 _fontIndex = i;
                 break;
@@ -142 +142 @@
     bool bSuccess = false;
 
-    const char *path = R2FilePath::getInstance()->getPath(fontFileName);
-    if (path == NULL) {
+    std::string path = R2FilePath::getInstance()->getPath(fontFileName);
+    if (path.empty()) {
         return false;
     }
-    std::ifstream fsInput(path, std::ios::binary);
+    std::ifstream fsInput(path.c_str(), std::ios::binary);
     if (fsInput) {
-        sFont._fontName = new char [strlen(fontName)+1];
-        strcpy(sFont._fontName, fontName);
+        sFont._fontName = fontName;
 
         // make sure this file is the correct type by checking the header
@@ -230 +229 @@
         fsInput.close();
     }
-    delete [] path;
     return bSuccess;
 }