diff --git a/deploy/lite/crnn_process.cc b/deploy/lite/crnn_process.cc index ca2a9df24752d9596c89610341b214173736a1d0..9f3df37d2745c67a219a60af99882ff06573d9f4 100644 --- a/deploy/lite/crnn_process.cc +++ b/deploy/lite/crnn_process.cc @@ -19,7 +19,7 @@ const std::vector rec_image_shape{3, 32, 320}; -cv::Mat CrnnResizeNormImg(cv::Mat img, float wh_ratio, bool is_norm) { +cv::Mat CrnnResizeImg(cv::Mat img, float wh_ratio) { int imgC, imgH, imgW; imgC = rec_image_shape[0]; imgW = rec_image_shape[2]; @@ -37,28 +37,7 @@ cv::Mat CrnnResizeNormImg(cv::Mat img, float wh_ratio, bool is_norm) { cv::resize(img, resize_img, cv::Size(resize_w, imgH), 0.f, 0.f, cv::INTER_LINEAR); - if (!is_norm) { - return resize_img; - } else { - resize_img.convertTo(resize_img, CV_32FC3, 1 / 255.f); - - for (int h = 0; h < resize_img.rows; h++) { - for (int w = 0; w < resize_img.cols; w++) { - resize_img.at(h, w)[0] = - (resize_img.at(h, w)[0] - 0.5) * 2; - resize_img.at(h, w)[1] = - (resize_img.at(h, w)[1] - 0.5) * 2; - resize_img.at(h, w)[2] = - (resize_img.at(h, w)[2] - 0.5) * 2; - } - } - - cv::Mat dist; - cv::copyMakeBorder(resize_img, dist, 0, 0, 0, int(imgW - resize_w), - cv::BORDER_CONSTANT, {0, 0, 0}); - - return dist; - } + return resize_img; } std::vector ReadDict(std::string path) { diff --git a/deploy/lite/crnn_process.h b/deploy/lite/crnn_process.h index a27e3046dde9de37b5e7cecad55a48fbe02fadcc..29e67906976198210394c4960786105bf884dce8 100644 --- a/deploy/lite/crnn_process.h +++ b/deploy/lite/crnn_process.h @@ -26,7 +26,7 @@ #include "opencv2/imgcodecs.hpp" #include "opencv2/imgproc.hpp" -cv::Mat CrnnResizeNormImg(cv::Mat img, float wh_ratio, bool is_norm); +cv::Mat CrnnResizeImg(cv::Mat img, float wh_ratio); std::vector ReadDict(std::string path); diff --git a/deploy/lite/ocr_db_crnn.cc b/deploy/lite/ocr_db_crnn.cc index 76fa97034e1ee53a7f7c66791875f066c63898fa..d251df3fb4d600186e0378fc47602b1ad98e6073 100644 --- a/deploy/lite/ocr_db_crnn.cc +++ b/deploy/lite/ocr_db_crnn.cc @@ -123,7 +123,7 @@ void RunRecModel(std::vector>> boxes, cv::Mat img, crop_img = GetRotateCropImage(srcimg, boxes[i]); float wh_ratio = float(crop_img.cols) / float(crop_img.rows); - resize_img = CrnnResizeNormImg(crop_img, wh_ratio, false); + resize_img = CrnnResizeImg(crop_img, wh_ratio); resize_img.convertTo(resize_img, CV_32FC3, 1 / 255.f); const float *dimg = reinterpret_cast(resize_img.data);