Skip to content

imgproc: Morphology erode and dilate #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ghost wants to merge 4 commits into
base: master
Choose a base branch
from
Open

imgproc: Morphology erode and dilate #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a309e5
imgproc: Added morphology functions erode and dilate, based on code a…
May 28, 2013
4f8656f
Use buffer cache instead of allocating a new buffer
May 29, 2013
c52e592
Remove loop since kernel size is fixed (for now)
May 29, 2013
3dcff02
Rebuilt files
May 28, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/jsfeat-min.js
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 59 additions & 1 deletion build/jsfeat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2665,6 +2665,56 @@ var jsfeat = jsfeat || { REVISION: 'ALPHA' };
}
}
}

var applyKernel = function(src, dst, fn){
if (src && src.type&jsfeat.U8_t
&& dst && dst.type&jsfeat.U8_t) {
var src_d, dst_d = dst.data, tmp_buff,
width = src.cols, height = src.rows,
offsets = [-width - 1, -width, -width + 1, -1, 1, width - 1, width, width + 1],
klen = offsets.length,
pos = 0, value, i, j, k;
if (src === dst) {
tmp_buff = jsfeat.cache.get_buffer(width*height);
src.copy_to(tmp_buff);
src_d = tmp_buff.data;
} else {
src_d = src.data;
}
for (i = 0; i < width; ++ i){
dst_d[pos ++] = 0;
}

for (i = 2; i < height; ++ i){
dst_d[pos ++] = 0;

for (j = 2; j < width; ++ j){
value = src_d[pos];

value = fn(value, src_d[ pos + offsets[0] ]);
value = fn(value, src_d[ pos + offsets[1] ]);
value = fn(value, src_d[ pos + offsets[2] ]);
value = fn(value, src_d[ pos + offsets[3] ]);
value = fn(value, src_d[ pos + offsets[4] ]);
value = fn(value, src_d[ pos + offsets[5] ]);
value = fn(value, src_d[ pos + offsets[6] ]);
value = fn(value, src_d[ pos + offsets[7] ]);

dst_d[pos ++] = value;
}

dst_d[pos ++] = 0;
}

for (i = 0; i < width; ++ i){
dst_d[pos ++] = 0;
}

if (src === dst) {
jsfeat.cache.put_buffer(tmp_buff);
}
}
}

return {
// TODO: add support for RGB/BGR order
Expand Down Expand Up @@ -3431,7 +3481,15 @@ var jsfeat = jsfeat || { REVISION: 'ALPHA' };
dst[i] = 0;
}
}
}
},

erode: function(src,dst) {
applyKernel(src,dst,Math.min);
},

dilate: function(src,dst) {
applyKernel(src,dst,Math.max);
}
};
})();

Expand Down
60 changes: 59 additions & 1 deletion src/jsfeat_imgproc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,56 @@
}
}
}

var applyKernel = function(src, dst, fn){
if (src && src.type&jsfeat.U8_t
&& dst && dst.type&jsfeat.U8_t) {
var src_d, dst_d = dst.data, tmp_buff,
width = src.cols, height = src.rows,
offsets = [-width - 1, -width, -width + 1, -1, 1, width - 1, width, width + 1],
klen = offsets.length,
pos = 0, value, i, j, k;
if (src === dst) {
tmp_buff = jsfeat.cache.get_buffer(width*height);
src.copy_to(tmp_buff);
src_d = tmp_buff.data;
} else {
src_d = src.data;
}
for (i = 0; i < width; ++ i){
dst_d[pos ++] = 0;
}

for (i = 2; i < height; ++ i){
dst_d[pos ++] = 0;

for (j = 2; j < width; ++ j){
value = src_d[pos];

value = fn(value, src_d[ pos + offsets[0] ]);
value = fn(value, src_d[ pos + offsets[1] ]);
value = fn(value, src_d[ pos + offsets[2] ]);
value = fn(value, src_d[ pos + offsets[3] ]);
value = fn(value, src_d[ pos + offsets[4] ]);
value = fn(value, src_d[ pos + offsets[5] ]);
value = fn(value, src_d[ pos + offsets[6] ]);
value = fn(value, src_d[ pos + offsets[7] ]);

dst_d[pos ++] = value;
}

dst_d[pos ++] = 0;
}

for (i = 0; i < width; ++ i){
dst_d[pos ++] = 0;
}

if (src === dst) {
jsfeat.cache.put_buffer(tmp_buff);
}
}
}

return {
// TODO: add support for RGB/BGR order
Expand Down Expand Up @@ -1134,7 +1184,15 @@
dst[i] = 0;
}
}
}
},

erode: function(src,dst) {
applyKernel(src,dst,Math.min);
},

dilate: function(src,dst) {
applyKernel(src,dst,Math.max);
}
};
})();

Expand Down