Merge pull request #2898 from PhilLab:2.4

This commit is contained in:
Vadim Pisarevsky
2014-07-18 09:26:49 +00:00
13 changed files with 55 additions and 55 deletions

View File

@@ -200,8 +200,8 @@ cv::ocl::FftPlan::FftPlan(Size _dft_size, int _src_step, int _dst_step, int _fla
clStridesOut[1] = dst_step / sizeof(float);
break;
default:
//std::runtime_error("does not support this convertion!");
cout << "Does not support this convertion!" << endl;
//std::runtime_error("does not support this conversion!");
cout << "Does not support this conversion!" << endl;
throw exception();
break;
}
@@ -324,8 +324,8 @@ void cv::ocl::dft(const oclMat &src, oclMat &dst, Size dft_size, int flags)
dst.create(src.rows, dft_size.width, CV_32FC1);
break;
default:
//std::runtime_error("does not support this convertion!");
cout << "Does not support this convertion!" << endl;
//std::runtime_error("does not support this conversion!");
cout << "Does not support this conversion!" << endl;
throw exception();
break;
}