Added min/max order filters vectors

This commit is contained in:
William DURAND 2011-12-06 22:17:12 +01:00
parent fcba1dcfbc
commit 8240c5c3e0

View File

@ -17,7 +17,7 @@
using namespace cimg_library;
/*
double min(std::vector<Euclidean> vect) {
double min(std::vector<Euclidean> vect) {
double min = (*vect.begin()).getDistance();
std::vector<Euclidean>::iterator it;
@ -28,9 +28,9 @@ double min(std::vector<Euclidean> vect) {
}
return min;
}
}
double max(std::vector<Euclidean> vect) {
double max(std::vector<Euclidean> vect) {
double max = (*vect.begin()).getDistance();
std::vector<Euclidean>::iterator it;
@ -41,8 +41,8 @@ double max(std::vector<Euclidean> vect) {
}
return max;
}
*/
}
*/
/*******************************************************************************
Main
@ -153,8 +153,7 @@ int main()
}
// Calculate the windows sizes
for(unsigned int i=0; i<vectEMin.size(); i++)
{
for(unsigned int i = 0; i < vectEMin.size(); i++) {
double d1 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance());
double d2 = MAX(vectEMax[i].getDistance(), vectEMin[i].getDistance());
double d3 = MIN(vectEMax[i].getDistance(), vectEMin[i].getDistance());
@ -165,7 +164,34 @@ int main()
w.push_back(wi);
}
CImg<unsigned char> imgSource = imgLena.channel(0);
// Order filters with source image
std::vector<unsigned char> vectFilterMax, vectFilterMin;
for(unsigned int i = 0; i < vectEMax.size(); i++) {
unsigned char max = 0;
for (int k = vectEMax[i].getX() - ((w[i] - 1) / 2); k < vectEMax[i].getX() + ((w[i] + 1) / 2); k++) {
for (int l = vectEMax[i].getY() - ((w[i] - 1) / 2); l < vectEMax[i].getY() + ((w[i] + 1) / 2); l++) {
if (imgSource(k, l) > max) {
max = imgSource(k, l);
}
}
}
vectFilterMax.push_back(max);
}
for(unsigned int i = 0; i < vectEMin.size(); i++) {
unsigned char min = 10000000;
for (int k = vectEMin[i].getX() - ((w[i] - 1) / 2); k < vectEMin[i].getX() + ((w[i] + 1) / 2); k++) {
for (int l = vectEMin[i].getY() - ((w[i] - 1) / 2); l < vectEMin[i].getY() + ((w[i] + 1) / 2); l++) {
if (imgSource(k, l) < min) {
min = imgSource(k, l);
}
}
}
vectFilterMin.push_back(min);
}
// Calculate the upper envelope