OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added a missing requires clause to the get_sum_of_area() function 

in the integral_image.  I also made the integral_image work
with signed pixel types.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%404212
This commit is contained in:
Davis King 2011-04-08 01:11:31 +00:00
parent 7745c5f978
commit 4af255e286
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlib/image_transforms/integral_image.h
View File

@ -35,13 +35,11 @@ namespace dlib
const image_type& img
)
{
COMPILE_TIME_ASSERT( pixel_traits<typename image_type::type>::is_unsigned == true );
unsigned long pixel;
long pixel;
int_img.set_size(img.nr(), img.nc());
// compute the first row of the integral image
unsigned long temp = 0;
long temp = 0;
for (long c = 0; c < img.nc(); ++c)
{
assign_pixel(pixel, img[0][c]);
@ -67,15 +65,16 @@ namespace dlib
const rectangle& rect
) const
{
DLIB_ASSERT(get_rect(*this).contains(rect) == true,
DLIB_ASSERT(get_rect(*this).contains(rect) == true && rect.is_empty() == false,
"\tlong get_sum_of_area(rect)"
<< "\n\tYou have given a rectangle that goes outside the image"
<< "\n\tthis: " << this
<< "\n\trect.is_empty(): " << rect.is_empty()
<< "\n\trect: " << rect
<< "\n\tget_rect(*this): " << get_rect(*this)
);
unsigned long top_left = 0, top_right = 0, bottom_left = 0, bottom_right = 0;
long top_left = 0, top_right = 0, bottom_left = 0, bottom_right = 0;
bottom_right = int_img[rect.bottom()][rect.right()];
if (rect.left()-1 >= 0 && rect.top()-1 >= 0)
@ -98,7 +97,7 @@ namespace dlib
private:
array2d<unsigned long>::kernel_1a int_img;
array2d<long>::kernel_1a_c int_img;
};

1
dlib/image_transforms/integral_image_abstract.h
View File

@ -65,6 +65,7 @@ namespace dlib
) const;
/*!
requires
- rect.is_empty() == false
- get_rect(*this).contains(rect) == true
(i.e. rect must not be outside the integral image)
ensures