From 7d4f7ec18c570402413d10d4698a14f9dc6be303 Mon Sep 17 00:00:00 2001 From: dviid Date: Wed, 29 Feb 2012 11:11:28 +0100 Subject: [PATCH] fixed the zoom problem --- src/CamNoiseAnalysis.cpp | 2 +- src/IResponseAnalysis.cpp | 2 +- src/ShadowScapesAnalysis.cpp | 3 ++- src/ShapeFromShadingAnalysis.cpp | 2 +- src/StrobeAnalysis.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/CamNoiseAnalysis.cpp b/src/CamNoiseAnalysis.cpp index c846854..6a47026 100755 --- a/src/CamNoiseAnalysis.cpp +++ b/src/CamNoiseAnalysis.cpp @@ -396,7 +396,7 @@ void CamNoiseAnalysis::draw() ofEnableAlphaBlending(); ofSetColor(255, 255, 255); - image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_GRAYSCALE); + image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_COLOR); image2.draw(0,0, ofGetWidth(), ofGetHeight()); ofDisableAlphaBlending(); diff --git a/src/IResponseAnalysis.cpp b/src/IResponseAnalysis.cpp index 16a377a..1119681 100755 --- a/src/IResponseAnalysis.cpp +++ b/src/IResponseAnalysis.cpp @@ -374,7 +374,7 @@ void IResponseAnalysis::draw() ofEnableAlphaBlending(); ofSetColor(255, 255, 255); - image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_GRAYSCALE); + image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_COLOR); image2.draw(0,0, ofGetWidth(), ofGetHeight()); ofDisableAlphaBlending(); diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp index f68da29..f3efb98 100755 --- a/src/ShadowScapesAnalysis.cpp +++ b/src/ShadowScapesAnalysis.cpp @@ -428,7 +428,8 @@ void ShadowScapesAnalysis::draw() ofEnableAlphaBlending(); ofSetColor(255, 255, 255); - image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_GRAYSCALE); + + image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_COLOR); image2.draw(0,0, ofGetWidth(), ofGetHeight()); ofDisableAlphaBlending(); diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp index 1780ad7..3dc12d9 100755 --- a/src/ShapeFromShadingAnalysis.cpp +++ b/src/ShapeFromShadingAnalysis.cpp @@ -567,7 +567,7 @@ void ShapeFromShadingAnalysis::draw() ofEnableAlphaBlending(); ofSetColor(255, 255, 255); - image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_GRAYSCALE); + image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_COLOR); image2.draw(0,0, ofGetWidth(), ofGetHeight()); ofDisableAlphaBlending(); diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp index d96b1a9..5c1a5d4 100755 --- a/src/StrobeAnalysis.cpp +++ b/src/StrobeAnalysis.cpp @@ -396,7 +396,7 @@ void StrobeAnalysis::draw() ofEnableAlphaBlending(); ofSetColor(255, 255, 255); - image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_GRAYSCALE); + image2.setFromPixels(image3.getPixels(),image3.width,image3.height, OF_IMAGE_COLOR); image2.draw(0,0, ofGetWidth(), ofGetHeight()); ofDisableAlphaBlending();