generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug in modules/java/src/cpp/Mat.cpp

Browse Source 
Removed some debugging insertions.
Added test for face detector.
Allowed tests to write on sdcard.
This commit is contained in:
Leonid Beynenson
2011-07-16 13:29:20 +00:00
parent 75bcb1bcfa
commit 570041fed5
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/java/src/cpp/Mat.cpp
View File

@@ -231,6 +231,7 @@ template<typename T> int mat_get(cv::Mat* m, int row, int col, int count, char*
if(! m) return 0;
if(! buff) return 0;
count *= sizeof(T);//This change is required, checked TODO: recheck for non-continious case
int rest = ((m->rows - row) * m->cols - col) * m->channels() * sizeof(T);
if(count>rest) count = rest;
int res = count;
@@ -243,7 +244,7 @@ template<typename T> int mat_get(cv::Mat* m, int row, int col, int count, char*
int num = (m->cols - col - 1) * m->channels() * sizeof(T); // 1st partial row
if(count<num) num = count;
uchar* data = m->ptr(row++, col);
while(count>0){
while(count>0){//TODO: recheck this cycle for the case col!=0
memcpy(buff, data, num);
count -= num;
buff += num;

4
modules/java/src/cpp/utils.cpp
View File

@@ -91,7 +91,6 @@ void Mat_to_vector_uchar(cv::Mat& mat, std::vector<uchar>& v_uchar)
void Mat_to_vector_Rect(Mat& mat, vector<Rect>& v_rect)
{
LOGD("Mat_to_vector_Rect start, mat.cols=%d", mat.cols);
v_rect.clear();
if(mat.type()!= CV_32SC4 || mat.rows!=1) {
@@ -103,17 +102,14 @@ void Mat_to_vector_Rect(Mat& mat, vector<Rect>& v_rect)
Vec<int, 4> v=mat.at< Vec<int, 4> >(0, i);
v_rect.push_back( Rect(v[0], v[1], v[2], v[3]) );
}
LOGD("Mat_to_vector_Rect end, vec.size=%d", (int)v_rect.size());
}
void vector_Rect_to_Mat(vector<Rect>& v_rect, Mat& mat)
{
LOGD("vector_Rect_to_Mat start, vec.size=%d", (int)v_rect.size());
mat.create(1, v_rect.size(), CV_32SC4);
for(size_t i=0; i<v_rect.size(); i++) {
mat.at< Vec<int, 4> >(0, i) = Vec<int, 4>(v_rect[i].x, v_rect[i].y, v_rect[i].width, v_rect[i].height);
}
LOGD("vector_Rect_to_Mat end, mat.cols=%d", mat.cols);
}