Commit 69e7ddb1 authored by Ken Martin's avatar Ken Martin

fix some dashboard warnings due to .c extension

The parser had a .c extension which caused some
warnings on one system as it contained c++ code.

Also fix a minor performance issue.
parent ec2e4d25
...@@ -70,7 +70,7 @@ void obj_set_material_defaults(vtkOBJImportedMaterial* mtl) ...@@ -70,7 +70,7 @@ void obj_set_material_defaults(vtkOBJImportedMaterial* mtl)
// check if the texture file referenced exists // check if the texture file referenced exists
// some files references png when they ship with jpg // some files references png when they ship with jpg
// so check for that as well // so check for that as well
void checkTextureMapFile(vtkOBJImportedMaterial *current_mtl, std::string texturePath) void checkTextureMapFile(vtkOBJImportedMaterial *current_mtl, std::string &texturePath)
{ {
// try texture as specified // try texture as specified
bool bFileExistsNoPath = vtksys::SystemTools::FileExists(current_mtl->texture_filename); bool bFileExistsNoPath = vtksys::SystemTools::FileExists(current_mtl->texture_filename);
...@@ -190,7 +190,7 @@ bool tokenGetVector(size_t &t, std::vector<Token> &tokens, ...@@ -190,7 +190,7 @@ bool tokenGetVector(size_t &t, std::vector<Token> &tokens,
bool tokenGetTexture(size_t &t, std::vector<Token> &tokens, bool tokenGetTexture(size_t &t, std::vector<Token> &tokens,
vtkOBJImportedMaterial *current_mtl, vtkOBJImportedMaterial *current_mtl,
std::string texturePath) std::string &texturePath)
{ {
// parse the next tokens looking for // parse the next tokens looking for
// texture options must all be on one line // texture options must all be on one line
...@@ -249,7 +249,7 @@ bool tokenGetTexture(size_t &t, std::vector<Token> &tokens, ...@@ -249,7 +249,7 @@ bool tokenGetTexture(size_t &t, std::vector<Token> &tokens,
} }
} }
#include "mtlsyntax.c" #include "mtlsyntax.cxx"
std::vector<vtkOBJImportedMaterial*> vtkOBJPolyDataProcessor::ParseOBJandMTL( std::vector<vtkOBJImportedMaterial*> vtkOBJPolyDataProcessor::ParseOBJandMTL(
std::string Filename, int& result_code) std::string Filename, int& result_code)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment