[opencv] 77/89: Merge pull request #7819 from alalek:fix_mulSpectrums_inplace_2.4

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 2.4.13.2
in repository opencv.

commit af0ee306cfc1df8e2b464d6b17f8140fd817d351
Merge: ffcf866 7bceef7
Author: Alexander Alekhin <alexander.a.alekhin at gmail.com>
Date:   Wed Dec 14 11:00:53 2016 +0000

    Merge pull request #7819 from alalek:fix_mulSpectrums_inplace_2.4

 cmake/OpenCVCompilerOptions.cmake |   9 +-
 modules/core/src/dxt.cpp          | 271 ++++++++++++++++++++------------------
 modules/core/test/test_dxt.cpp    |  61 ++++-----
 modules/imgproc/src/phasecorr.cpp |   3 +
 4 files changed, 179 insertions(+), 165 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git