mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed an XML parser issue on OSX

metadata
Wenzel Jakob 2011-06-20 10:09:33 +02:00
parent e656f0849a
commit da30f8ce5d
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/librender/scenehandler.cpp
View File

@ -25,9 +25,14 @@
MTS_NAMESPACE_BEGIN MTS_NAMESPACE_BEGIN
#define XMLLog(level, fmt, ...) Thread::getThread()->getLogger()->log(\ #if !defined(__OSX__)
level, NULL, __FILE__, __LINE__, "Near file offset %i: " fmt, \ #define XMLLog(level, fmt, ...) Thread::getThread()->getLogger()->log(\
(int) m_parser->getSrcOffset(), ## __VA_ARGS__) level, NULL, __FILE__, __LINE__, "Near file offset %i: " fmt, \
(int) m_parser->getSrcOffset(), ## __VA_ARGS__)
#else
#define XMLLog(level, fmt, ...) Thread::getThread()->getLogger()->log(\
level, NULL, __FILE__, __LINE__, fmt, ## __VA_ARGS__)
#endif
SceneHandler::SceneHandler(const SAXParser *parser, SceneHandler::SceneHandler(const SAXParser *parser,
const ParameterMap &params, NamedObjectMap *namedObjects, const ParameterMap &params, NamedObjectMap *namedObjects,
@ -390,7 +395,10 @@ void SceneHandler::endElement(const XMLCh* const xmlName) {
parser->setDoNamespaces(true); parser->setDoNamespaces(true);
parser->setDocumentHandler(handler); parser->setDocumentHandler(handler);
parser->setErrorHandler(handler); parser->setErrorHandler(handler);
parser->setCalculateSrcOfs(true); #if !defined(__OSX__)
/// Not supported on OSX
parser->setCalculateSrcOfs(true);
#endif
fs::path path = resolver->resolve(context.attributes["filename"]); fs::path path = resolver->resolve(context.attributes["filename"]);
XMLLog(EInfo, "Parsing included file \"%s\" ..", path.filename().c_str()); XMLLog(EInfo, "Parsing included file \"%s\" ..", path.filename().c_str());
parser->parse(path.file_string().c_str()); parser->parse(path.file_string().c_str());

5
src/mitsuba/mitsuba.cpp
View File

@ -311,7 +311,10 @@ int ubi_main(int argc, char **argv) {
parser->setValidationSchemaFullChecking(true); parser->setValidationSchemaFullChecking(true);
parser->setValidationScheme(SAXParser::Val_Always); parser->setValidationScheme(SAXParser::Val_Always);
parser->setExternalNoNamespaceSchemaLocation(schemaPath.file_string().c_str()); parser->setExternalNoNamespaceSchemaLocation(schemaPath.file_string().c_str());
parser->setCalculateSrcOfs(true); #if !defined(__OSX__)
/// Not supported on OSX
parser->setCalculateSrcOfs(true);
#endif
/* Set the handler */ /* Set the handler */
SceneHandler *handler = new SceneHandler(parser, parameters); SceneHandler *handler = new SceneHandler(parser, parameters);

5
src/qtgui/sceneloader.cpp
View File

@ -74,7 +74,10 @@ void SceneLoader::run() {
parser->setValidationSchemaFullChecking(true); parser->setValidationSchemaFullChecking(true);
parser->setValidationScheme(SAXParser::Val_Always); parser->setValidationScheme(SAXParser::Val_Always);
parser->setExternalNoNamespaceSchemaLocation(schemaPath.file_string().c_str()); parser->setExternalNoNamespaceSchemaLocation(schemaPath.file_string().c_str());
parser->setCalculateSrcOfs(true); #if !defined(__OSX__)
/// Not supported on OSX
parser->setCalculateSrcOfs(true);
#endif
/* Set the SAX handler */ /* Set the SAX handler */
parser->setDoNamespaces(true); parser->setDoNamespaces(true);