|
@@ -36,7 +36,10 @@ int doDetection(cv::Mat cvImage) {
|
|
cv::Scalar mu, sigma;
|
|
cv::Scalar mu, sigma;
|
|
cv::meanStdDev(laplacianImage, mu, sigma);
|
|
cv::meanStdDev(laplacianImage, mu, sigma);
|
|
int blur_value = sigma.val[0] * sigma.val[0];
|
|
int blur_value = sigma.val[0] * sigma.val[0];
|
|
- blur_value = blur_value < DEFAULT_BLUR_THRESHOLD ? image_color_ratio(grayCVImage)==0?blur_value : image_color_ratio(grayCVImage):blur_value;
|
|
|
|
|
|
+ if (blur_value < DEFAULT_BLUR_THRESHOLD) {
|
|
|
|
+ int color = image_color_ratio(grayCVImage);
|
|
|
|
+ blur_value = color == 0 ? blur_value : color;
|
|
|
|
+ }
|
|
cvImage.release();
|
|
cvImage.release();
|
|
grayCVImage.release();
|
|
grayCVImage.release();
|
|
return blur_value;
|
|
return blur_value;
|
|
@@ -76,7 +79,7 @@ int image_color_ratio(cv::Mat image) {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- float i = (float )maxCount / (float )(image.rows * image.cols);
|
|
|
|
|
|
+ float i = (float) maxCount / (float) (image.rows * image.cols);
|
|
if (i >= DEFAULT_PIX_THRESHOLD) {
|
|
if (i >= DEFAULT_PIX_THRESHOLD) {
|
|
num = DEFAULT_BLUR_THRESHOLD + 1;
|
|
num = DEFAULT_BLUR_THRESHOLD + 1;
|
|
};
|
|
};
|