FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #874 from blobfish/occt7.4

Browse Source 
Occt7.4
This commit is contained in:
OpenSceneGraph git repository 2019-12-22 12:29:47 +00:00 committed by GitHub
commit c50b699992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeModules/FindOpenCascade.cmake
View File

@ -8,7 +8,7 @@
# correspond to the ./configure --prefix=$OPENCASCADE_DIR # correspond to the ./configure --prefix=$OPENCASCADE_DIR
# used in building OPENCASCADE. # used in building OPENCASCADE.
FIND_PATH(OPENCASCADE_INCLUDE_DIR BRepMesh.hxx FIND_PATH(OPENCASCADE_INCLUDE_DIR Standard_Version.hxx
PATHS PATHS
${OPENCASCADE_DIR} ${OPENCASCADE_DIR}
$ENV{OPENCASCADE_DIR} $ENV{OPENCASCADE_DIR}

6
src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp
View File

@ -292,7 +292,7 @@ osg::ref_ptr<osg::Geode> ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c
/// transfer data from reader to doc /// transfer data from reader to doc
if(!reader.Transfer(doc)) if(!reader.Transfer(doc))
{ {
cout << "Cannot read any relevant data from the STEP file" << endl; std::cout << "Cannot read any relevant data from the STEP file" << std::endl;
return NULL; return NULL;
} }
} }
@ -309,7 +309,7 @@ osg::ref_ptr<osg::Geode> ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c
/// transfer data from reader to doc /// transfer data from reader to doc
if(!reader.Transfer(doc)) if(!reader.Transfer(doc))
{ {
cout << "Cannot read any relevant data from the IGES file" << endl; std::cout << "Cannot read any relevant data from the IGES file" << std::endl;
return NULL; return NULL;
} }
} }
@ -327,7 +327,7 @@ osg::ref_ptr<osg::Geode> ReaderWritterOpenCASCADE::OCCTKReader::igesToOSGGeode(c
if(freeShapes.Length() == 0) if(freeShapes.Length() == 0)
{ {
std::cout << "No Shapes found" << endl; std::cout << "No Shapes found" << std::endl;
return NULL; return NULL;
} }
else else