Merge pull request #3388 from bartaandras:master

This commit is contained in:
Vadim Pisarevsky 2014-11-05 11:04:06 +00:00
commit c4906c7f43

View File

@ -618,7 +618,7 @@ public:
scale[j*2] = mj;
scale[j*2+1] = Mj;
}
else
else if( !no_scale )
{
t = t*inv_scale[j*2] + inv_scale[2*j+1];
if( t < m1 || t > M1 )