From 722d1be32e33fab70779051c828736077fa5d18b Mon Sep 17 00:00:00 2001 From: William DURAND Date: Tue, 10 Jan 2012 08:49:05 +0100 Subject: [PATCH] Added real decomposition loop --- main.cpp | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/main.cpp b/main.cpp index 96c7d35..ce560c2 100644 --- a/main.cpp +++ b/main.cpp @@ -17,6 +17,8 @@ #include #endif +#define NB_ITERATIONS 3 + #define MIN(x,y) ((x)<(y)?(x):(y)) #define MAX(x,y) ((x)>(y)?(x):(y)) @@ -390,33 +392,24 @@ CImg decompose(const CImg input) *******************************************************************************/ int main() { - char buffer [50]; - CImg inputImg("lena.bmp"); - CImgDisplay dispBase(inputImg, "Source Image"); + char title[50]; + CImgDisplay disp[NB_ITERATIONS + 1]; - // 1st decomposition - CImg imgMode1 = decompose(inputImg); - CImgDisplay dispMode1(imgMode1, "Mode 1"); + CImg inputImg("lena.bmp"), imgMode; + disp[0].assign(inputImg, "Source Image"); - CImg imgMode2 = decompose(inputImg - imgMode1); - CImgDisplay dispMode2(imgMode2, "Mode 2"); - - /* - for (int i = 2; i < 3; i++) { - sprintf(buffer, "Mode %d", i); - fprintf(stdout, "Decomposing %s\n", buffer); + for (int i = 1; i < NB_ITERATIONS; i++) { + sprintf(title, "BEMC-%d", i); + fprintf(stdout, "Decomposing %s\n", title); + imgMode = decompose(inputImg); inputImg = inputImg - imgMode; - imgMode = decompose(inputImg); - CImgDisplay dispModeBis(imgMode, buffer); + disp[i].assign(imgMode, title); } - */ - printf("End.\n"); - - while (!dispBase.is_closed()) { - dispBase.wait(); + while (!disp[0].is_closed()) { + disp[0].wait(); } return 0;