- Timestamp:
- Jun 11, 2014, 2:44:37 PM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/geovis/RendererCmd.cpp
r4382 r4383 785 785 std::string url; 786 786 if (objc > 6) { 787 url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[5]))); 787 char *urlIn = Tcl_GetString(objv[5]); 788 url = g_renderer->getCanonicalPath(std::string(urlIn)); 788 789 if (url.empty()) { 789 790 Tcl_AppendResult(interp, "file not found: \"", 790 url .c_str(), "\"", (char*)NULL);791 urlIn, "\"", (char*)NULL); 791 792 return TCL_ERROR; 792 793 } … … 841 842 } else if (type[0] == 'e' && strcmp(type, "elevation") == 0) { 842 843 char *driver = Tcl_GetString(objv[4]); 843 std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[5]))); 844 char *urlIn = Tcl_GetString(objv[5]); 845 std::string url = g_renderer->getCanonicalPath(std::string(urlIn)); 844 846 if (url.empty()) { 845 847 Tcl_AppendResult(interp, "file not found: \"", 846 url .c_str(), "\"", (char*)NULL);848 urlIn, "\"", (char*)NULL); 847 849 return TCL_ERROR; 848 850 } … … 869 871 } else if (type[0] == 'p' && strcmp(type, "point") == 0) { 870 872 osgEarth::Drivers::OGRFeatureOptions opts; 871 std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4]))); 873 char *urlIn = Tcl_GetString(objv[4]); 874 std::string url = g_renderer->getCanonicalPath(std::string(urlIn)); 872 875 if (url.empty()) { 873 876 Tcl_AppendResult(interp, "file not found: \"", 874 url .c_str(), "\"", (char*)NULL);877 urlIn, "\"", (char*)NULL); 875 878 return TCL_ERROR; 876 879 } … … 896 899 } else if (type[0] == 'p' && strcmp(type, "polygon") == 0) { 897 900 osgEarth::Drivers::OGRFeatureOptions opts; 898 std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4]))); 901 char *urlIn = Tcl_GetString(objv[4]); 902 std::string url = g_renderer->getCanonicalPath(std::string(urlIn)); 899 903 if (url.empty()) { 900 904 Tcl_AppendResult(interp, "file not found: \"", 901 url .c_str(), "\"", (char*)NULL);905 urlIn, "\"", (char*)NULL); 902 906 return TCL_ERROR; 903 907 } … … 921 925 } else if (type[0] == 'l' && strcmp(type, "line") == 0) { 922 926 osgEarth::Drivers::OGRFeatureOptions opts; 923 std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4]))); 927 char *urlIn = Tcl_GetString(objv[4]); 928 std::string url = g_renderer->getCanonicalPath(std::string(urlIn)); 924 929 if (url.empty()) { 925 930 Tcl_AppendResult(interp, "file not found: \"", 926 url .c_str(), "\"", (char*)NULL);931 urlIn, "\"", (char*)NULL); 927 932 return TCL_ERROR; 928 933 } … … 953 958 } else if (type[0] == 't' && strcmp(type, "text") == 0) { 954 959 osgEarth::Drivers::OGRFeatureOptions opts; 955 std::string url = g_renderer->getCanonicalPath(std::string(Tcl_GetString(objv[4]))); 960 char *urlIn = Tcl_GetString(objv[4]); 961 std::string url = g_renderer->getCanonicalPath(std::string(urlIn)); 956 962 if (url.empty()) { 957 963 Tcl_AppendResult(interp, "file not found: \"", 958 url .c_str(), "\"", (char*)NULL);964 urlIn, "\"", (char*)NULL); 959 965 return TCL_ERROR; 960 966 }
Note: See TracChangeset
for help on using the changeset viewer.