Olena-patches June 2013

olena-patches@lrde.epita.fr

5 participants
104 discussions

olena: branch sandbox/anthony updated: olena-2.0-592-ge6c9b24

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch sandbox/anthony has been updated via e6c9b2483d5651c061cad24ace0a87a7a8ce8a4d (commit) from a674962cd9a863e37b7165bd4ef5a1d8fddde6d1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- e6c9b24 Add Keypoint class and start extremum elimination ----------------------------------------------------------------------- Summary of changes: milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/keypoint.cc | 18 + milena/sandbox/anthony/src/keypoint.hh | 27 ++ milena/sandbox/anthony/src/scale_space.cc | 517 ----------------------------- 4 files changed, 46 insertions(+), 518 deletions(-) create mode 100644 milena/sandbox/anthony/src/keypoint.cc create mode 100644 milena/sandbox/anthony/src/keypoint.hh delete mode 100644 milena/sandbox/anthony/src/scale_space.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 11 months

olena: olena-2.0-591-ga674962 Add upscaled first octave

by Anthony Seure

--- milena/sandbox/anthony/src/scale_space.cc | 191 ++++++++++++++++++++++++++--- 1 files changed, 174 insertions(+), 17 deletions(-) diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc index 735d3f1..87853ef 100644 --- a/milena/sandbox/anthony/src/scale_space.cc +++ b/milena/sandbox/anthony/src/scale_space.cc @@ -11,19 +11,19 @@ using namespace mln; // Set the gaussian kernel -double *gaussian_kernel() +float *gaussian_kernel() { - double variance = sqrt(2.0); + float variance = sqrt(2.0); unsigned index = 0; - double *kernel = new double[49]; - static const double pi = 4.0 * atan(1.0); - double div = (2.0 * pi * variance); + float *kernel = new float[49]; + static const float pi = 4.0 * atan(1.0); + float div = (2.0 * pi * variance); for (int i = -3; i < 4; ++i) { for (int j = -3; j < 4; ++j) { - double e = exp(- (i*i + j*j) / (2.0 * variance) ); + float e = exp(- (i*i + j*j) / (2.0 * variance) ); kernel[index++] = e / div; } } @@ -33,7 +33,7 @@ double *gaussian_kernel() // Apply the convolution of the image by the kernel template<typename I> -void convolve(const I& original, I& filtered, double *kernel) +void convolve(const I& original, I& filtered, float *kernel) { mln_piter(I) p(filtered.domain()); window2d win; @@ -68,7 +68,7 @@ template<typename I> I blur(const I& original) { I filtered; - double *kernel = gaussian_kernel(); + float *kernel = gaussian_kernel(); initialize(filtered, original); convolve(original, filtered, kernel); @@ -125,6 +125,160 @@ I downscaling2(const I& original) return reduced; } +float *upscalingTL_kernel() +{ + const static float one = 1.0 / 8.0; + const static float two = 2.0 / 8.0; + const static float three = 2.0 / 8.0; + const static float four = 3.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +float *upscalingTR_kernel() +{ + const static float one = 2.0 / 8.0; + const static float two = 1.0 / 8.0; + const static float three = 3.0 / 8.0; + const static float four = 2.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +float *upscalingBL_kernel() +{ + const static float one = 2.0 / 8.0; + const static float two = 3.0 / 8.0; + const static float three = 1.0 / 8.0; + const static float four = 2.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +float *upscalingBR_kernel() +{ + const static float one = 3.0 / 8.0; + const static float two = 2.0 / 8.0; + const static float three = 2.0 / 8.0; + const static float four = 1.0 / 8.0; + + float *kernel = new float[4]; + + kernel[0] = one; + kernel[1] = two; + kernel[2] = three; + kernel[3] = four; + + return kernel; +} + +template<typename I> +unsigned upscalePixel(const I& original, int i, int j, int type) +{ + float *kernel; + window2d win; + mln_psite(I) p(i, j); + float value = 0; + unsigned index = 0; + int iStart = 0; + int jStart = 0; + + if (type == 0) + { + kernel = upscalingTL_kernel(); + iStart = -1; + jStart = -1; + } + else if (type == 1) + { + kernel = upscalingTR_kernel(); + iStart = 0; + jStart = -1; + } + else if (type == 2) + { + kernel = upscalingBL_kernel(); + iStart = -1; + jStart = 0; + } + else + { + kernel = upscalingBR_kernel(); + iStart = 0; + jStart = 0; + } + + for (int ii = iStart; ii < iStart + 2; ++ii) + for (int jj = jStart; jj < jStart + 2; ++jj) + win.insert(ii, jj); + + mln_qiter(window2d) q(win, p); + + for_all(q) + { + if (original.has(q)) + { + value += original(q) * kernel[index]; + } + + ++index; + } + + return (static_cast<int>(value)); +} + +// Upscale by 2 the image resolution +template<typename I> +I upscaling2(const I& original) +{ + box2d size(original.nrows() * 2, original.ncols() * 2); + I upscaled(size); + + mln_piter(I) p(upscaled.domain()); + int index = 0; + + for_all(p) + { + int i = p.col(); + int j = p.row(); + + if (i % 2 == 0 && j % 2 == 0) // Top left + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 0); + else if (i % 2 == 0) // Bottom left + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 2); + else if (j % 2 == 0) // Top right + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 1); + else // Bottom right + opt::at(upscaled, i, j) = upscalePixel(original, i / 2, j / 2, 3); + + ++index; + } + + + return upscaled; +} + // Build the n-th octave on b blur levels template<typename I> void buildOctave(const I& original, @@ -165,18 +319,22 @@ void buildScaleSpace(std::vector< std::vector >& scaleSpace, { if (n > 2) { + // Upscaled octave + I upscaled = upscaling2(original); + buildOctave(upscaled, 0, b, scaleSpace); + // 1st octave buildOctave(original, 1, b, scaleSpace); // 2nd octave - I reduced = downscaling2(original); - buildOctave(reduced, 2, b, scaleSpace); + I downscaled = downscaling2(original); + buildOctave(downscaled, 2, b, scaleSpace); for (unsigned i = 3; i <= n; ++i) { // i-th octave - reduced = downscaling2(reduced); - buildOctave(reduced, i, b, scaleSpace); + downscaled = downscaling2(downscaled); + buildOctave(downscaled, i, b, scaleSpace); } } else @@ -279,9 +437,6 @@ void buildExtrema(C extrema, std::vector< std::vector >& dogSpace) { extrema = data::convert(value::rgb8(), original); - //value::int_u8 min = 255; - //value::int_u8 max = 0; - //value::int_u8 center = 0; const unsigned blur_level = dogSpace.at(0).size(); @@ -316,7 +471,8 @@ void buildExtrema(C extrema, if (center < min) { - mln_psite(I) pOriginal(p.row() * pow(2, j), p.col() * pow(2, j)); + mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), + p.col() * pow(2, (j-1))); extrema(pOriginal) = literal::red; } } @@ -326,7 +482,8 @@ void buildExtrema(C extrema, if (center > max) { - mln_psite(I) pOriginal(p.row() * pow(2, j), p.col() * pow(2, j)); + mln_psite(I) pOriginal(p.row() * pow(2, (j-1)), + p.col() * pow(2, (j-1))); extrema(pOriginal) = literal::red; } } -- 1.7.2.5

10 years, 11 months

olena: branch sandbox/anthony updated: olena-2.0-591-ga674962

by git＠lrde.epita.fr

10 years, 11 months

olena: olena-2.0-590-g8020a9b Fix "too many keypoints" error

by Anthony Seure

--- milena/sandbox/anthony/src/scale_space.cc | 71 +++++++++++++++-------------- 1 files changed, 36 insertions(+), 35 deletions(-) diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc index 074eff4..735d3f1 100644 --- a/milena/sandbox/anthony/src/scale_space.cc +++ b/milena/sandbox/anthony/src/scale_space.cc @@ -10,20 +10,20 @@ using namespace mln; -// Set the gaussian kernel of size (6 * t + 1) -double *gaussian_kernel(unsigned t) +// Set the gaussian kernel +double *gaussian_kernel() { - int size = 6 * t + 1; + double variance = sqrt(2.0); unsigned index = 0; - double *kernel = new double[size * size]; + double *kernel = new double[49]; static const double pi = 4.0 * atan(1.0); - double div = (2.0 * pi * t * t); + double div = (2.0 * pi * variance); - for (int i = -(size / 2); i < (size / 2) + 1; ++i) + for (int i = -3; i < 4; ++i) { - for (int j = -(size / 2); j < (size / 2) + 1; ++j) + for (int j = -3; j < 4; ++j) { - double e = exp(- (i * i + j * j) / (2.0 * t * t) ); + double e = exp(- (i*i + j*j) / (2.0 * variance) ); kernel[index++] = e / div; } } @@ -33,14 +33,13 @@ double *gaussian_kernel(unsigned t) // Apply the convolution of the image by the kernel template<typename I> -void convolve(const I& original, I& filtered, double *kernel, unsigned t) +void convolve(const I& original, I& filtered, double *kernel) { mln_piter(I) p(filtered.domain()); - int size = 6 * t + 1; window2d win; - for (int i = -(size / 2); i < (size / 2) + 1; ++i) - for (int j = -(size / 2); j < (size / 2) + 1; ++j) + for (int i = -3; i < 4; ++i) + for (int j = -3; j < 4; ++j) win.insert(i, j); // Iterate through all image sites @@ -66,20 +65,20 @@ void convolve(const I& original, I& filtered, double *kernel, unsigned t) // Blur the image thanks to a convolution matrix template<typename I> -I blur(const I& original, unsigned t) +I blur(const I& original) { I filtered; - double *kernel = gaussian_kernel(t); + double *kernel = gaussian_kernel(); initialize(filtered, original); - convolve(original, filtered, kernel, t); + convolve(original, filtered, kernel); return filtered; } // Downscale by 2 the image resolution template<typename I> -I downscaleResolution(const I& original) +I downscaling2(const I& original) { mln_piter(I) p(original.domain()); window2d win; @@ -142,10 +141,11 @@ void buildOctave(const I& original, io::pgm::save(original, name.str()); octave.push_back(original); + blured = duplicate(original); for(unsigned i = 1; i <= b; i *= 2) { - blured = blur(original, i); + blured = blur(blured); octave.push_back(blured); name.str(""); @@ -169,13 +169,13 @@ void buildScaleSpace(std::vector< std::vector >& scaleSpace, buildOctave(original, 1, b, scaleSpace); // 2nd octave - I reduced = downscaleResolution(original); + I reduced = downscaling2(original); buildOctave(reduced, 2, b, scaleSpace); for (unsigned i = 3; i <= n; ++i) { // i-th octave - reduced = downscaleResolution(reduced); + reduced = downscaling2(reduced); buildOctave(reduced, i, b, scaleSpace); } } @@ -209,7 +209,7 @@ void buildDifferenceOfGaussianSpace(std::vector< std::vector >& scaleSpace, for_all(p) { - int diff = ((int) level2(p)) - ((int) level1(p)); + int diff = ((int) level1(p)) - ((int) level2(p)); dog(p) = (diff >= 0) ? diff : 0; } @@ -238,7 +238,6 @@ void find_extremum(T& min, T& max, const I& current, N n) // Find the minimum value in the upper and lower layers around p template<typename T, typename I, typename P> -//void find_min(T& min, const I& upper, const I& lower, const P& p) void find_min(T& min, const I& upper, const I& lower, const P& pUpper, const P& pLower) { mln_niter(neighb2d) nUpper(c8(), pUpper); @@ -257,7 +256,6 @@ void find_min(T& min, const I& upper, const I& lower, const P& pUpper, const P& // Find the maximum value in the upper and lower layers around p template<typename T, typename I, typename P> -//void find_max(T& max, const I& upper, const I& lower, const P& p) void find_max(T& max, const I& upper, const I& lower, const P& pUpper, const P& pLower) { mln_niter(neighb2d) nUpper(c8(), pUpper); @@ -281,12 +279,11 @@ void buildExtrema(C extrema, std::vector< std::vector >& dogSpace) { extrema = data::convert(value::rgb8(), original); - //initialize(extrema, original); - value::int_u8 min = 255; - value::int_u8 max = 0; - value::int_u8 center = 0; + //value::int_u8 min = 255; + //value::int_u8 max = 0; + //value::int_u8 center = 0; - const unsigned blur_level = dogSpace.at(0).size(); //TODO Reverse the vector + const unsigned blur_level = dogSpace.at(0).size(); //unsigned i = 0; for (unsigned i = 0; i < blur_level; ++i) @@ -301,6 +298,10 @@ void buildExtrema(C extrema, for_all(p) { + value::int_u8 min = 255; + value::int_u8 max = 0; + value::int_u8 center = 0; + mln_niter(neighb2d) n(c8(), p); center = current(p); @@ -313,19 +314,19 @@ void buildExtrema(C extrema, { find_min(min, upper, lower, pUpper, pLower); - if (center <= min) + if (center < min) { - mln_psite(I) pOriginal(p.row() * (j+1), p.col() * (j+1)); - extrema(pOriginal) = literal::blue; + mln_psite(I) pOriginal(p.row() * pow(2, j), p.col() * pow(2, j)); + extrema(pOriginal) = literal::red; } } else if (center >= max) { - find_max(min, upper, lower, pUpper, pLower); + find_max(max, upper, lower, pUpper, pLower); - if (center >= max) + if (center > max) { - mln_psite(I) pOriginal(p.row() * (j+1), p.col() * (j+1)); + mln_psite(I) pOriginal(p.row() * pow(2, j), p.col() * pow(2, j)); extrema(pOriginal) = literal::red; } } @@ -342,14 +343,14 @@ int main(int argc, char** argv) typedef image2d<value::int_u8> I; typedef image2d<value::rgb8> C; - const unsigned blur_level = 4; + const unsigned blur_level = 5; const unsigned octave_level = 4; std::vector< std::vector > scaleSpace; std::vector< std::vector > dogSpace; I original; C extrema; - io::pgm::load(original, "images/keith512.pgm"); + io::pgm::load(original, "images/lena.pgm"); buildScaleSpace(scaleSpace, original, octave_level, blur_level); buildDifferenceOfGaussianSpace(scaleSpace, dogSpace); -- 1.7.2.5

10 years, 11 months

olena: olena-2.0-589-g6cc7082 Compute and display extremum BUT resolution scaling factor TO CHANGE (2 -> 1, 5)

by Anthony Seure

--- milena/sandbox/anthony/src/scale_space.cc | 90 ++++++++++++++++++----------- 1 files changed, 56 insertions(+), 34 deletions(-) diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc index 0eca2b6..074eff4 100644 --- a/milena/sandbox/anthony/src/scale_space.cc +++ b/milena/sandbox/anthony/src/scale_space.cc @@ -4,6 +4,7 @@ #include <mln/io/ppm/save.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/literal/all.hh> +#include <mln/value/int_s8.hh> #include <cmath> @@ -207,7 +208,10 @@ void buildDifferenceOfGaussianSpace(std::vector< std::vector >& scaleSpace, mln_piter(I) p(level1.domain()); for_all(p) - dog(p) = level1(p) - level2(p); + { + int diff = ((int) level2(p)) - ((int) level1(p)); + dog(p) = (diff >= 0) ? diff : 0; + } dogOctave.push_back(dog); name << "output/DoG_o" << i << "-" << j << ".pgm"; @@ -234,34 +238,40 @@ void find_extremum(T& min, T& max, const I& current, N n) // Find the minimum value in the upper and lower layers around p template<typename T, typename I, typename P> -void find_min(T& min, const I& upper, const I& lower, const P& p) +//void find_min(T& min, const I& upper, const I& lower, const P& p) +void find_min(T& min, const I& upper, const I& lower, const P& pUpper, const P& pLower) { - mln_niter(neighb2d) n(c8(), p); - - for_all(n) - { - if (lower(n) < min) - min = lower(n); - - if (upper(n) < min) - min = upper(n); - } + mln_niter(neighb2d) nUpper(c8(), pUpper); + mln_niter(neighb2d) nLower(c8(), pLower); + + // Upper processing + for_all(nUpper) + if (upper(nUpper) < min) + min = upper(nUpper); + + // Lower processing + for_all(nLower) + if (lower(nLower) < min) + min = lower(nLower); } // Find the maximum value in the upper and lower layers around p template<typename T, typename I, typename P> -void find_max(T& max, const I& upper, const I& lower, const P& p) +//void find_max(T& max, const I& upper, const I& lower, const P& p) +void find_max(T& max, const I& upper, const I& lower, const P& pUpper, const P& pLower) { - mln_niter(neighb2d) n(c8(), p); - - for_all(n) - { - if (lower(n) > max) - max = lower(n); - - if (upper(n) > max) - max = upper(n); - } + mln_niter(neighb2d) nUpper(c8(), pUpper); + mln_niter(neighb2d) nLower(c8(), pLower); + + // Upper processing + for_all(nUpper) + if (upper(nUpper) > max) + max = upper(nUpper); + + // Lower processing + for_all(nLower) + if (lower(nLower) > max) + max = lower(nLower); } // Build the extrema image @@ -271,19 +281,21 @@ void buildExtrema(C extrema, std::vector< std::vector >& dogSpace) { extrema = data::convert(value::rgb8(), original); + //initialize(extrema, original); value::int_u8 min = 255; value::int_u8 max = 0; value::int_u8 center = 0; - for (unsigned i = 0; i < dogSpace.size(); ++i) - { - std::vector octave = dogSpace.at(i); + const unsigned blur_level = dogSpace.at(0).size(); //TODO Reverse the vector - for (unsigned j = 1; j < octave.size() - 1; ++j) + //unsigned i = 0; + for (unsigned i = 0; i < blur_level; ++i) + { + for (unsigned j = 1; j < dogSpace.size() - 1; ++j) { - I current = octave.at(j); - I upper = octave.at(j+1); - I lower = octave.at(j-1); + I current = dogSpace.at(j).at(i); + I upper = dogSpace.at(j+1).at(i); + I lower = dogSpace.at(j-1).at(i); mln_piter(I) p(current.domain()); @@ -292,25 +304,35 @@ void buildExtrema(C extrema, mln_niter(neighb2d) n(c8(), p); center = current(p); + mln_psite(I) pUpper(p.row() / 2, p.col() / 2); + mln_psite(I) pLower(p.row() * 2, p.col() * 2); + find_extremum(min, max, current, n); if (center <= min) { - find_min(min, upper, lower, p); + find_min(min, upper, lower, pUpper, pLower); if (center <= min) - extrema(p) = literal::blue; + { + mln_psite(I) pOriginal(p.row() * (j+1), p.col() * (j+1)); + extrema(pOriginal) = literal::blue; + } } else if (center >= max) { - find_max(max, upper, lower, p); + find_max(min, upper, lower, pUpper, pLower); if (center >= max) - extrema(p) = literal::red; + { + mln_psite(I) pOriginal(p.row() * (j+1), p.col() * (j+1)); + extrema(pOriginal) = literal::red; + } } } } } + io::ppm::save(extrema, "output/extrema.ppm"); } -- 1.7.2.5

10 years, 11 months

olena: olena-2.0-588-gd0ee538 Find extremum of the image

by Anthony Seure

--- milena/sandbox/anthony/Makefile | 4 +- milena/sandbox/anthony/src/scale_space.cc | 171 ++++++++++++++++++++++++++--- 2 files changed, 157 insertions(+), 18 deletions(-) diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index 558bef5..e43db7f 100644 --- a/milena/sandbox/anthony/Makefile +++ b/milena/sandbox/anthony/Makefile @@ -9,10 +9,10 @@ OUTPUT=a.out all: scale -scale: +scale: clean $(CCACHE) $(CC) $(CFLAGS) -O3 -DNDEBUG $(CLIBS) $(SRC) -o $(OUTPUT) -debug: +debug: mrproper $(CCACHE) $(CC) $(CFLAGS) -g -ggdb $(CLIBS) $(SRC) -o $(OUTPUT) clean: diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc index 61308c4..0eca2b6 100644 --- a/milena/sandbox/anthony/src/scale_space.cc +++ b/milena/sandbox/anthony/src/scale_space.cc @@ -1,6 +1,9 @@ #include <mln/core/image/image2d.hh> #include <mln/data/all.hh> #include <mln/io/pgm/all.hh> +#include <mln/io/ppm/save.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/literal/all.hh> #include <cmath> @@ -36,13 +39,8 @@ void convolve(const I& original, I& filtered, double *kernel, unsigned t) window2d win; for (int i = -(size / 2); i < (size / 2) + 1; ++i) - { for (int j = -(size / 2); j < (size / 2) + 1; ++j) - { win.insert(i, j); - } - } - // Iterate through all image sites for_all(p) @@ -139,7 +137,7 @@ void buildOctave(const I& original, I blured; initialize(blured, original); - name << "output/o" << n << "b0.pgm"; + name << "output/SS-o" << n << "-0.pgm"; io::pgm::save(original, name.str()); octave.push_back(original); @@ -150,49 +148,190 @@ void buildOctave(const I& original, octave.push_back(blured); name.str(""); - name << "output/o" << n << "b" < void buildScaleSpace(std::vector< std::vector >& scaleSpace, const I& original, - unsigned octave_level, - unsigned blur_level) + unsigned n, + unsigned b) { - if (octave_level > 2) + if (n > 2) { // 1st octave - buildOctave(original, 1, blur_level, scaleSpace); + buildOctave(original, 1, b, scaleSpace); // 2nd octave I reduced = downscaleResolution(original); - buildOctave(reduced, 2, blur_level, scaleSpace); + buildOctave(reduced, 2, b, scaleSpace); - for (unsigned i = 3; i <= octave_level; ++i) + for (unsigned i = 3; i <= n; ++i) { // i-th octave reduced = downscaleResolution(reduced); - buildOctave(reduced, i, blur_level, scaleSpace); + buildOctave(reduced, i, b, scaleSpace); + } + } + else + { + std::cerr << "ERROR: buildScaleSpace: Wrong level number (" << n << ")" + << std::endl; + } +} + +// Build the DoG pyramid of the scale space +template<typename I> +void buildDifferenceOfGaussianSpace(std::vector< std::vector >& scaleSpace, + std::vector< std::vector >& dogSpace) +{ + for (unsigned i = 0; i < scaleSpace.size(); ++i) + { + std::vector octave = scaleSpace.at(i); + std::vector dogOctave; + + for (unsigned j = 0; j < octave.size() - 1; ++j) + { + std::stringstream name; + I level1 = octave.at(j); + I level2 = octave.at(j + 1); + I dog; + + initialize(dog, level1); + + mln_piter(I) p(level1.domain()); + + for_all(p) + dog(p) = level1(p) - level2(p); + + dogOctave.push_back(dog); + name << "output/DoG_o" < +void find_extremum(T& min, T& max, const I& current, N n) +{ + for_all(n) + { + if (current(n) > max) + max = current(n); + + if (current(n) < min) + min = current(n); } } +// Find the minimum value in the upper and lower layers around p +template<typename T, typename I, typename P> +void find_min(T& min, const I& upper, const I& lower, const P& p) +{ + mln_niter(neighb2d) n(c8(), p); + + for_all(n) + { + if (lower(n) < min) + min = lower(n); + + if (upper(n) < min) + min = upper(n); + } +} + +// Find the maximum value in the upper and lower layers around p +template<typename T, typename I, typename P> +void find_max(T& max, const I& upper, const I& lower, const P& p) +{ + mln_niter(neighb2d) n(c8(), p); + + for_all(n) + { + if (lower(n) > max) + max = lower(n); + + if (upper(n) > max) + max = upper(n); + } +} + +// Build the extrema image +template<typename I, typename C> +void buildExtrema(C extrema, + I original, + std::vector< std::vector >& dogSpace) +{ + extrema = data::convert(value::rgb8(), original); + value::int_u8 min = 255; + value::int_u8 max = 0; + value::int_u8 center = 0; + + for (unsigned i = 0; i < dogSpace.size(); ++i) + { + std::vector octave = dogSpace.at(i); + + for (unsigned j = 1; j < octave.size() - 1; ++j) + { + I current = octave.at(j); + I upper = octave.at(j+1); + I lower = octave.at(j-1); + + mln_piter(I) p(current.domain()); + + for_all(p) + { + mln_niter(neighb2d) n(c8(), p); + center = current(p); + + find_extremum(min, max, current, n); + + if (center <= min) + { + find_min(min, upper, lower, p); + + if (center <= min) + extrema(p) = literal::blue; + } + else if (center >= max) + { + find_max(max, upper, lower, p); + + if (center >= max) + extrema(p) = literal::red; + } + } + } + } + io::ppm::save(extrema, "output/extrema.ppm"); +} + // Main entry point int main(int argc, char** argv) { typedef image2d<value::int_u8> I; - const unsigned blur_level = 3; + typedef image2d<value::rgb8> C; + + const unsigned blur_level = 4; const unsigned octave_level = 4; std::vector< std::vector > scaleSpace; + std::vector< std::vector > dogSpace; I original; + C extrema; - io::pgm::load(original, "images/flower.pgm"); + io::pgm::load(original, "images/keith512.pgm"); buildScaleSpace(scaleSpace, original, octave_level, blur_level); + buildDifferenceOfGaussianSpace(scaleSpace, dogSpace); + buildExtrema(extrema, original, dogSpace); return 0; } -- 1.7.2.5

10 years, 11 months

olena: olena-2.0-587-gbacc2e1 Build scale space inside a vector for use in extrema localization

by Anthony Seure

--- milena/sandbox/anthony/Makefile | 2 +- milena/sandbox/anthony/src/scale_space.cc | 60 ++++++++++++++++++++--------- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/milena/sandbox/anthony/Makefile b/milena/sandbox/anthony/Makefile index 81f788e..558bef5 100644 --- a/milena/sandbox/anthony/Makefile +++ b/milena/sandbox/anthony/Makefile @@ -10,7 +10,7 @@ OUTPUT=a.out all: scale scale: - $(CCACHE) $(CC) $(CFLAGS) -O2 -DNDEBUG $(CLIBS) $(SRC) -o $(OUTPUT) + $(CCACHE) $(CC) $(CFLAGS) -O3 -DNDEBUG $(CLIBS) $(SRC) -o $(OUTPUT) debug: $(CCACHE) $(CC) $(CFLAGS) -g -ggdb $(CLIBS) $(SRC) -o $(OUTPUT) diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc index d7b0570..61308c4 100644 --- a/milena/sandbox/anthony/src/scale_space.cc +++ b/milena/sandbox/anthony/src/scale_space.cc @@ -129,8 +129,12 @@ I downscaleResolution(const I& original) // Build the n-th octave on b blur levels template<typename I> -void buildOctave(const I& original, unsigned n, unsigned b) +void buildOctave(const I& original, + unsigned n, + unsigned b, + std::vector< std::vector >& scaleSpace) { + std::vector octave; std::stringstream name; I blured; initialize(blured, original); @@ -138,37 +142,57 @@ void buildOctave(const I& original, unsigned n, unsigned b) name << "output/o" << n << "b0.pgm"; io::pgm::save(original, name.str()); + octave.push_back(original); + for(unsigned i = 1; i <= b; i *= 2) { blured = blur(original, i); + octave.push_back(blured); + name.str(""); name << "output/o" << n << "b" < +void buildScaleSpace(std::vector< std::vector >& scaleSpace, + const I& original, + unsigned octave_level, + unsigned blur_level) { - image2d<value::int_u8> original; - io::pgm::load(original, "images/flower.pgm"); - const unsigned blur_level = 4; - unsigned octave = 1; + if (octave_level > 2) + { + // 1st octave + buildOctave(original, 1, blur_level, scaleSpace); - // 1st octave - buildOctave(original, octave++, blur_level); + // 2nd octave + I reduced = downscaleResolution(original); + buildOctave(reduced, 2, blur_level, scaleSpace); - // 2nd octave - image2d<value::int_u8> reduced = downscaleResolution(original); - buildOctave(reduced, octave++, blur_level); + for (unsigned i = 3; i <= octave_level; ++i) + { + // i-th octave + reduced = downscaleResolution(reduced); + buildOctave(reduced, i, blur_level, scaleSpace); + } + } +} + +// Main entry point +int main(int argc, char** argv) +{ + typedef image2d<value::int_u8> I; + const unsigned blur_level = 3; + const unsigned octave_level = 4; + std::vector< std::vector > scaleSpace; + I original; - // 3rd octave - reduced = downscaleResolution(reduced); - buildOctave(reduced, octave++, blur_level); + io::pgm::load(original, "images/flower.pgm"); - // 4th octave - reduced = downscaleResolution(reduced); - buildOctave(reduced, octave++, blur_level); + buildScaleSpace(scaleSpace, original, octave_level, blur_level); return 0; } -- 1.7.2.5

10 years, 11 months

olena: branch sandbox/anthony updated: olena-2.0-590-g8020a9b

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch sandbox/anthony has been updated via 8020a9b93b5ccdafd6fcf810cc3cddafe70a1dae (commit) via 6cc7082289672e0ffce59cf96ff6e8eab5b9b98e (commit) via d0ee5384b5af5eb5a9df1d2121ac733d8c1bb0c4 (commit) via bacc2e1ef82b965c4f5c4455ce81c082ab26cbd3 (commit) from 82555836eee6be994349379073645c7ffb95efd2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 8020a9b Fix "too many keypoints" error 6cc7082 Compute and display extremum BUT resolution scaling factor TO CHANGE (2 -> 1,5) d0ee538 Find extremum of the image bacc2e1 Build scale space inside a vector for use in extrema localization ----------------------------------------------------------------------- Summary of changes: milena/sandbox/anthony/Makefile | 6 +- milena/sandbox/anthony/src/scale_space.cc | 268 ++++++++++++++++++++++++----- 2 files changed, 230 insertions(+), 44 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 11 months

olena: olena-2.0-586-g8255583 Fix merge conflicts with ICDAR13 recognition table work from Roland

by Anthony Seure

This is a merge commit message of the following branches: Merge: cd3eaf5 f16ceed hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 11 months

olena: olena-2.0-572-gcd3eaf5 Create a full scale space

by Anthony Seure

--- milena/sandbox/anthony/src/scale_space.cc | 100 +++++++++++++++++++++++------ 1 files changed, 80 insertions(+), 20 deletions(-) diff --git a/milena/sandbox/anthony/src/scale_space.cc b/milena/sandbox/anthony/src/scale_space.cc index 31180af..d7b0570 100644 --- a/milena/sandbox/anthony/src/scale_space.cc +++ b/milena/sandbox/anthony/src/scale_space.cc @@ -1,11 +1,6 @@ #include <mln/core/image/image2d.hh> -#include <mln/core/alias/neighb2d.hh> #include <mln/data/all.hh> #include <mln/io/pgm/all.hh> -#include <mln/literal/all.hh> -#include <mln/value/all.hh> -#include <mln/make/w_window2d.hh> -#include <mln/core/alias/w_window2d_int.hh> #include <cmath> @@ -72,7 +67,7 @@ void convolve(const I& original, I& filtered, double *kernel, unsigned t) // Blur the image thanks to a convolution matrix template<typename I> -image2d<value::int_u8> blur(const I& original, unsigned t) +I blur(const I& original, unsigned t) { I filtered; double *kernel = gaussian_kernel(t); @@ -83,32 +78,97 @@ image2d<value::int_u8> blur(const I& original, unsigned t) return filtered; } +// Downscale by 2 the image resolution template<typename I> -void downscaleResolution(const I& original, I& toReduce) +I downscaleResolution(const I& original) { + mln_piter(I) p(original.domain()); + window2d win; + int index = 0; + + // Initialize the rescaled image + box2d size(original.nrows() / 2, original.ncols() / 2); + I reduced(size); + + // Set the 2x2 window matrix + for (int i = 0; i < 2; ++i) + for (int j = 0; j < 2; ++j) + win.insert(i, j); + + // Iterate through all image sites + for_all(p) + { + // Get 1/4 of total pixels + if (index % 2 == 0) + { + int i = (index % original.ncols()) / 2; + int j = (index / original.ncols()) / 2; + int count = 0; + int sum = 0; + mln_qiter(window2d) q(win, p); + + // Iterate through all window image sites + for_all(q) + { + if (original.has(q)) + { + sum += original(q); + ++count; + } + } + + if (reduced.has(point2d(j, i))) + opt::at(reduced, j, i) = sum / count; + } + + ++index; + } + + return reduced; } -// MAIN ENTRY POINT +// Build the n-th octave on b blur levels +template<typename I> +void buildOctave(const I& original, unsigned n, unsigned b) +{ + std::stringstream name; + I blured; + initialize(blured, original); + + name << "output/o" << n << "b0.pgm"; + io::pgm::save(original, name.str()); + + for(unsigned i = 1; i <= b; i *= 2) + { + blured = blur(original, i); + name.str(""); + name << "output/o" << n << "b" < original; io::pgm::load(original, "images/flower.pgm"); + const unsigned blur_level = 4; + unsigned octave = 1; - image2d<value::int_u8> blur1, blur2, blur4; - initialize(blur1, original); - initialize(blur2, original); - initialize(blur4, original); - - io::pgm::save(original, "output/original.pgm"); + // 1st octave + buildOctave(original, octave++, blur_level); - blur1 = blur(original, 1); - io::pgm::save(blur1, "output/blur1.pgm"); + // 2nd octave + image2d<value::int_u8> reduced = downscaleResolution(original); + buildOctave(reduced, octave++, blur_level); - blur2 = blur(original, 2); - io::pgm::save(blur2, "output/blur2.pgm"); + // 3rd octave + reduced = downscaleResolution(reduced); + buildOctave(reduced, octave++, blur_level); - blur4 = blur(original, 4); - io::pgm::save(blur4, "output/blur4.pgm"); + // 4th octave + reduced = downscaleResolution(reduced); + buildOctave(reduced, octave++, blur_level); return 0; } -- 1.7.2.5

10 years, 11 months

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches June 2013