diff options
author | Guillaume Seguin <guillaume@segu.in> | 2010-06-25 14:28:07 -0400 |
---|---|---|
committer | Guillaume Seguin <guillaume@segu.in> | 2010-06-25 14:28:07 -0400 |
commit | 6e2d670812ff12b00c64d18a112a8f75737d7d33 (patch) | |
tree | 51fb081530ec6c4b7a079d46b9329df48346380c /libmoped/src | |
parent | c43fb7cb98bc36cf0b97652492e748a191ef7939 (diff) | |
download | cmu-master.tar.gz cmu-master.tar.bz2 |
Diffstat (limited to 'libmoped/src')
-rw-r--r-- | libmoped/src/sfm/SFM_TRACKING_DISPLAY.hpp | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/libmoped/src/sfm/SFM_TRACKING_DISPLAY.hpp b/libmoped/src/sfm/SFM_TRACKING_DISPLAY.hpp index a3f5ddc..62fa9b2 100644 --- a/libmoped/src/sfm/SFM_TRACKING_DISPLAY.hpp +++ b/libmoped/src/sfm/SFM_TRACKING_DISPLAY.hpp @@ -27,7 +27,7 @@ namespace MopedNS { SET_CONFIG(display); } - void processOne (FrameData &frameData, int i) { + inline void processOne (FrameData &frameData, int i) { Image *image = frameData.images[i].get (); IplImage* img0 = cvCreateImage (cvSize (image->width, image->height), @@ -74,43 +74,8 @@ namespace MopedNS { if (display < 2) return; - for( int i=0; i<(int)frameData.images.size(); i++) { + for( int i=0; i<(int)frameData.images.size(); i++) processOne (frameData, i); - /* - string windowName = _stepName + " #" + toString(i) + ":" + frameData.images[i]->name; - - cvNamedWindow( windowName.c_str(), CV_WINDOW_AUTOSIZE); - - IplImage* img = cvCreateImage(cvSize(frameData.images[i]->width,frameData.images[i]->height), IPL_DEPTH_8U, 3); - - for (int y = 0; y < frameData.images[i]->height; y++) { - for (int x = 0; x < frameData.images[i]->width; x++) { - img->imageData[y*img->widthStep+3*x + 0] = frameData.images[i]->data[y*frameData.images[i]->width + x]; - img->imageData[y*img->widthStep+3*x + 1] = frameData.images[i]->data[y*frameData.images[i]->width + x]; - img->imageData[y*img->widthStep+3*x + 2] = frameData.images[i]->data[y*frameData.images[i]->width + x]; - } - } - - foreach( featureKind, frameData.detectedFeatures ) { - - int objectHash = 0; - for(unsigned int x=0; x<featureKind.first.size(); x++) objectHash = objectHash ^ featureKind.first[x]; - CvScalar color = objectColors[objectHash % 256]; - - foreach( corresp, featureKind.second ) { - if( corresp.imageIdx==i ) - cvCircle(img, cvPoint( corresp.coord2D[0], corresp.coord2D[1]), 2, color , CV_FILLED, CV_AA ); - } - } - - cvShowImage (windowName.c_str(), img); - - cvReleaseImage(&img); - } - - cvWaitKey( 10 ); - */ - } } }; }; |