gauthiier/RefractiveIndex
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

cleaned up the windows code there were some mistakes

Browse Source 
had to comment out the #ifdef TARGET_OSX   for a bit to see that there
were some windows errors - think i got all of them... have a look Tom
This commit is contained in:
Jamie Allen 2012-02-27 03:06:40 +01:00
parent 5d48d6ef6a
commit 7cd4da7341
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/AbstractAnalysis.cpp
View File

@ -103,14 +103,14 @@ void AbstractAnalysis::create_dir_allocate_images()
myColorImage1.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, OF_IMAGE_COLOR); myColorImage1.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, OF_IMAGE_COLOR);
//ofxCvImage myColorCvImage2; //ofxCvImage myColorCvImage2;
myColorCvImage2.clear(); myColorImage2.clear();
myColorCvImage2.setUseTexture(false); myColorImage2.setUseTexture(false);
myColorCvImage2.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h); myColorImage2.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, OF_IMAGE_COLOR);
//ofxCvImage myGrayCvImage1; //ofxCvImage myGrayCvImage1;
myGrayCvImage1.clear(); myGrayImage1.clear();
myGrayCvImage1.setUseTexture(false); myGrayImage1.setUseTexture(false);
myGrayCvImage1.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h); myGrayImage1.allocate(RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, OF_IMAGE_GRAYSCALE);
//////////////////////////////END ALLOCATE IMAGES ////////////////////////////////////////////////// //////////////////////////////END ALLOCATE IMAGES //////////////////////////////////////////////////
@ -128,22 +128,22 @@ void AbstractAnalysis::saveImageAnalysis(string filename)
return; return;
} }
#ifdef TARGET_OSX //#ifdef TARGET_OSX
ofSaveImage(RefractiveIndex::_pixels, _whole_file_path_analysis+"/"+filename, OF_IMAGE_QUALITY_BEST); // ofSaveImage(RefractiveIndex::_pixels, _whole_file_path_analysis+"/"+filename, OF_IMAGE_QUALITY_BEST);
#elif defined(TARGET_WIN32) //#elif defined(TARGET_WIN32)
//<---- NEW SAVING - seems to fix WINDOWS saving out BLACK FRAMES PROBLEM ----> //<---- NEW SAVING - seems to fix WINDOWS saving out BLACK FRAMES PROBLEM ---->
unsigned char * somePixels; unsigned char * somePixels;
ofPixels appPix = RefractiveIndex::_pixels; ofPixels appPix = RefractiveIndex::_pixels;
somePixels = appPix.getPixels(); somePixels = appPix.getPixels();
myColorImage1.setUseTexture(false);
myColorImage1.setFromPixels(somePixels,appPix.getWidth(),appPix.getHeight(), OF_IMAGE_COLOR); myColorImage1.setFromPixels(somePixels,appPix.getWidth(),appPix.getHeight(), OF_IMAGE_COLOR);
myColorImage1.saveImage(ofToDataPath("")+ _whole_file_path_analysis+"/"+filename); myColorImage1.saveImage(ofToDataPath("")+ _whole_file_path_analysis+"/"+filename);
myColorImage1.clear(); myColorImage1.clear();
#endif //#endif
_saved_filenames_analysis.push_back(_whole_file_path_analysis+"/"+filename); _saved_filenames_analysis.push_back(_whole_file_path_analysis+"/"+filename);
@ -160,15 +160,17 @@ void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels
#elif defined(TARGET_WIN32) #elif defined(TARGET_WIN32)
if (newType == OF_IMAGE_COLOR){ if (newType == OF_IMAGE_COLOR){
myColorCvImage2.setFromPixels(newPixels.getPixels(), newPixels.width, newPixels.width, OF_IMAGE_COLOR); myColorImage2.setUseTexture(false);
myColorCvImage2.saveImage(_whole_file_path_synthesis+"/"+thisfilename); myColorImage2.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_COLOR);
myColorCvImage2.clear(); myColorImage2.saveImage(_whole_file_path_synthesis+"/"+filename);
myColorImage2.clear();
} }
if (newType == OF_IMAGE_GRAYSCALE){ if (newType == OF_IMAGE_GRAYSCALE){
myGrayCvImage1.setFromPixels(newPixels.getPixels(), newPixels.width, newPixels.width, OF_IMAGE_GRAYSCALE); myGrayImage1.setUseTexture(false);
myGrayCvImage1.saveImage(_whole_file_path_synthesis+"/"+thisfilename); myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_GRAYSCALE);
myGrayCvImage1.clear(); myGrayImage1.saveImage(_whole_file_path_synthesis+"/"+filename);
myGrayImage1.clear();
} }
#endif #endif

8
src/AbstractAnalysis.h
View File

@ -63,11 +63,9 @@ protected:
int _state; int _state;
ofImage myColorImage; ofImage myColorImage1;
ofImage myBlackWhiteImage; ofImage myColorImage2;
ofImage myGrayImage1;
ofxCvColorImage myColorCvImage2;
ofxCvColorImage myGrayCvImage1;
//int _run_cnt; //int _run_cnt;