From f10aeefaef714547fd6baab1b67321187853df3c Mon Sep 17 00:00:00 2001 From: Jamie Allen Date: Mon, 27 Feb 2012 18:50:12 +0100 Subject: [PATCH] Revert "Revert 7da4b4b47a01c19f5059bea111c2edb7c2ddefd8^..HEAD" This reverts commit cd49615cfc50e554847ffb8a31269fd5a82c7171. --- src/AbstractAnalysis.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/AbstractAnalysis.cpp b/src/AbstractAnalysis.cpp index a11afa6..55b6778 100644 --- a/src/AbstractAnalysis.cpp +++ b/src/AbstractAnalysis.cpp @@ -153,11 +153,11 @@ void AbstractAnalysis::saveImageAnalysis(string filename) void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels, ofImageType newType) { -//#ifdef TARGET_OSX +#ifdef TARGET_OSX - // ofSaveImage(newPixels->getPixelsRef(), _whole_file_path_synthesis+"/"+filename, OF_IMAGE_QUALITY_BEST); + ofSaveImage(newPixels->getPixelsRef(), _whole_file_path_synthesis+"/"+filename, OF_IMAGE_QUALITY_BEST); -//#elif defined(TARGET_WIN32) +#elif defined(TARGET_WIN32) if (newType == OF_IMAGE_COLOR){ myColorImage2.setUseTexture(false); @@ -168,17 +168,12 @@ void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels if (newType == OF_IMAGE_GRAYSCALE){ myGrayImage1.setUseTexture(false); - - // THIS IS HOW YOU HAVE TO SAVE OUT THE GREYSCALE IMAGES on WINDOWS FOR SOME REASON --> i.e.: as an OF_IMAGE_COLOR - myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_COLOR); - - // THIS DOESN' SEEM TO SAVE OUT IMAGES ON WINDOWS - //myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_GRAYSCALE); + myGrayImage1.setFromPixels(newPixels->getPixels(), newPixels->getWidth(), newPixels->getHeight(), OF_IMAGE_GRAYSCALE); myGrayImage1.saveImage(_whole_file_path_synthesis+"/"+filename); myGrayImage1.clear(); } -//#endif +#endif _saved_filenames_synthesis.push_back(_whole_file_path_synthesis+"/"+filename);