diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc index 9d59612e98..0951702153 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc @@ -716,7 +716,7 @@ inline void MergeImpl(const std::vector &mv, T *dst_ptr, int height, in } bool Merge(const std::vector &mv, LiteMat &dst) { - if (mv.empty() || mv.size() > 4) return false; + if (mv.size() != 1 && mv.size() != 3 && mv.size() != 4) return false; int width = mv[0].width_; int height = mv[0].height_; @@ -972,9 +972,7 @@ bool Subtract(const LiteMat &src1, const LiteMat &src2, LiteMat &dst) { size_t total_size = src1.height_ * src1.width_ * src1.channel_; - if (src1.data_type_ == LDataType::BOOL) { - SubtractImpl(src1, src2, dst, total_size); - } else if (src1.data_type_ == LDataType::INT8) { + if (src1.data_type_ == LDataType::INT8) { SubtractImpl(src1, src2, dst, total_size); } else if (src1.data_type_ == LDataType::UINT8) { SubtractImpl(src1, src2, dst, total_size); diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/lite_mat.h b/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/lite_mat.h index ad6b278dc7..ce0ff058ec 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/lite_mat.h +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/lite_mat.h @@ -55,6 +55,11 @@ struct Chn4 { T c4; }; +using BOOL_C1 = Chn1; +using BOOL_C2 = Chn2; +using BOOL_C3 = Chn3; +using BOOL_C4 = Chn4; + using UINT8_C1 = Chn1; using UINT8_C2 = Chn2; using UINT8_C3 = Chn3; @@ -85,6 +90,16 @@ using INT32_C2 = Chn2; using INT32_C3 = Chn3; using INT32_C4 = Chn4; +using UINT64_C1 = Chn1; +using UINT64_C2 = Chn2; +using UINT64_C3 = Chn3; +using UINT64_C4 = Chn4; + +using INT64_C1 = Chn1; +using INT64_C2 = Chn2; +using INT64_C3 = Chn3; +using INT64_C4 = Chn4; + using FLOAT32_C1 = Chn1; using FLOAT32_C2 = Chn2; using FLOAT32_C3 = Chn3;