mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

switched to use RunXmlScript always (missing '\n' at the end of xml script was a problem)

Browse Source
This commit is contained in:
Maria Dimashova 2012-03-21 08:56:38 +00:00
parent faf845d31f
commit 67d7669188
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/highgui/src/cap_openni.cpp
View File

@ -41,15 +41,10 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/imgproc/imgproc.hpp" #include "opencv2/imgproc/imgproc.hpp"
#ifdef HAVE_OPENNI #ifdef HAVE_OPENNI
#define HACK_WITH_XML
#ifdef HACK_WITH_XML
#include <iostream> #include <iostream>
#include <fstream>
#endif
#include "XnCppWrapper.h" #include "XnCppWrapper.h"
const std::string XMLConfig = const std::string XMLConfig =
@ -79,7 +74,7 @@ const std::string XMLConfig =
"</Configuration>" "</Configuration>"
"</Node>" "</Node>"
"</ProductionNodes>" "</ProductionNodes>"
"</OpenNI>"; "</OpenNI>\n";
class CvCapture_OpenNI : public CvCapture class CvCapture_OpenNI : public CvCapture
{ {
@ -206,22 +201,7 @@ CvCapture_OpenNI::CvCapture_OpenNI( int index )
return; return;
} }
#ifdef HACK_WITH_XML
// Write configuration to the temporary file.
// This is a hack, because there is a bug in RunXmlScript().
// TODO: remove hack when bug in RunXmlScript() will be fixed.
std::string xmlFilename = "opencv_kinect_configure.xml";
std::ofstream outfile( xmlFilename.c_str() );
outfile.write( XMLConfig.c_str(), XMLConfig.length() );
outfile.close();
status = context.RunXmlScriptFromFile( xmlFilename.c_str() );
// Remove temporary configuration file.
remove( xmlFilename.c_str() );
#else
status = context.RunXmlScript( XMLConfig.c_str() ); status = context.RunXmlScript( XMLConfig.c_str() );
#endif
if( status != XN_STATUS_OK ) if( status != XN_STATUS_OK )
{ {
std::cerr << "CvCapture_OpenNI::CvCapture_OpenNI : Failed to run xml script: " std::cerr << "CvCapture_OpenNI::CvCapture_OpenNI : Failed to run xml script: "