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

fixed http://code.opencv.org/issues/4278

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-29 11:58:49 +03:00
parent a8226814c5
commit 0746ec7035
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/core/src/matmul.cpp
View File

@ -1195,7 +1195,7 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
GEMMBlockMulFunc blockMulFunc; GEMMBlockMulFunc blockMulFunc;
GEMMStoreFunc storeFunc; GEMMStoreFunc storeFunc;
Mat *matD = &D, tmat; Mat *matD = &D, tmat;
int tmat_size = 0; size_t tmat_size = 0;
const uchar* Cdata = C.data; const uchar* Cdata = C.data;
size_t Cstep = C.data ? (size_t)C.step : 0; size_t Cstep = C.data ? (size_t)C.step : 0;
AutoBuffer<uchar> buf; AutoBuffer<uchar> buf;
@ -1228,7 +1228,7 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
if( D.data == A.data || D.data == B.data ) if( D.data == A.data || D.data == B.data )
{ {
tmat_size = d_size.width*d_size.height*CV_ELEM_SIZE(type); tmat_size = (size_t)d_size.width*d_size.height*CV_ELEM_SIZE(type);
// Allocate tmat later, once the size of buf is known // Allocate tmat later, once the size of buf is known
matD = &tmat; matD = &tmat;
} }
@ -1319,7 +1319,7 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
int is_b_t = flags & GEMM_2_T; int is_b_t = flags & GEMM_2_T;
int elem_size = CV_ELEM_SIZE(type); int elem_size = CV_ELEM_SIZE(type);
int dk0_1, dk0_2; int dk0_1, dk0_2;
int a_buf_size = 0, b_buf_size, d_buf_size; size_t a_buf_size = 0, b_buf_size, d_buf_size;
uchar* a_buf = 0; uchar* a_buf = 0;
uchar* b_buf = 0; uchar* b_buf = 0;
uchar* d_buf = 0; uchar* d_buf = 0;
@ -1360,12 +1360,12 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
dn0 = block_size / dk0; dn0 = block_size / dk0;
dk0_1 = (dn0+dn0/8+2) & -2; dk0_1 = (dn0+dn0/8+2) & -2;
b_buf_size = (dk0+dk0/8+1)*dk0_1*elem_size; b_buf_size = (size_t)(dk0+dk0/8+1)*dk0_1*elem_size;
d_buf_size = (dk0+dk0/8+1)*dk0_1*work_elem_size; d_buf_size = (size_t)(dk0+dk0/8+1)*dk0_1*work_elem_size;
if( is_a_t ) if( is_a_t )
{ {
a_buf_size = (dm0+dm0/8+1)*((dk0+dk0/8+2)&-2)*elem_size; a_buf_size = (size_t)(dm0+dm0/8+1)*((dk0+dk0/8+2)&-2)*elem_size;
flags &= ~GEMM_1_T; flags &= ~GEMM_1_T;
} }