There's some disagreement about the correct formula.
has its supporters, however, for texture analysis, the newly introduced formula became
standard. The commit enables both uses without breaking backward compatibility.

First contributor of this commit was sperrholz.

reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.