diff options
author | Justin Berger <j.david.berger@gmail.com> | 2018-03-17 16:12:40 -0600 |
---|---|---|
committer | Justin Berger <j.david.berger@gmail.com> | 2018-03-17 16:12:40 -0600 |
commit | 954816d74e5460bc6d57ec682a5960a1a85298b1 (patch) | |
tree | 87b3d6a0a3fb4dbb2d00b2aac8154e1c47e9ca14 /redist/minimal_opencv.c | |
parent | 93627f6b89d22e6e2f87df0bd4d809e168958b1d (diff) | |
parent | 728936f7dce1bc545b5136590a6eb660771266d4 (diff) | |
download | libsurvive-954816d74e5460bc6d57ec682a5960a1a85298b1.tar.gz libsurvive-954816d74e5460bc6d57ec682a5960a1a85298b1.tar.bz2 |
Merge branch 'master' into sba
Diffstat (limited to 'redist/minimal_opencv.c')
-rw-r--r-- | redist/minimal_opencv.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/redist/minimal_opencv.c b/redist/minimal_opencv.c index e8a6214..50eb7df 100644 --- a/redist/minimal_opencv.c +++ b/redist/minimal_opencv.c @@ -44,11 +44,8 @@ void cvGEMM(const CvMat *src1, const CvMat *src2, double alpha, const CvMat *src beta = 0; cblas_dgemm(CblasRowMajor, (tABC & GEMM_1_T) ? CblasTrans : CblasNoTrans, - (tABC & GEMM_2_T) ? CblasTrans : CblasNoTrans, src1->rows, dst->cols, src1->cols, alpha, - - src1->data.db, lda, src2->data.db, ldb, beta, - - dst->data.db, dst->cols); + (tABC & GEMM_2_T) ? CblasTrans : CblasNoTrans, src1->rows, dst->cols, src1->cols, alpha, src1->data.db, + lda, src2->data.db, ldb, beta, dst->data.db, dst->cols); } void cvMulTransposed(const CvMat *src, CvMat *dst, int order, const CvMat *delta, double scale) { @@ -67,11 +64,7 @@ void cvMulTransposed(const CvMat *src, CvMat *dst, int order, const CvMat *delta lapack_int dstCols = dst->cols; cblas_dgemm(CblasRowMajor, isAT ? CblasTrans : CblasNoTrans, isBT ? CblasTrans : CblasNoTrans, cols, dstCols, rows, - scale, - - src->data.db, cols, src->data.db, cols, beta, - - dst->data.db, dstCols); + scale, src->data.db, cols, src->data.db, cols, beta, dst->data.db, dstCols); } void *cvAlloc(size_t size) { return malloc(size); } |