p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!11249 【MD】fix bug for extractchannel when type is UINT16 

From: @xulei2020
Reviewed-by: @heleiwang,@liucunwei
Signed-off-by: @liucunwei
This commit is contained in:
mindspore-ci-bot 2021-01-15 14:33:16 +08:00 committed by Gitee
parent 9c2724d6d4 5dd651f1a5
commit dfa6daaa57
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mindspore/ccsrc/minddata/dataset/kernels/image/lite_cv/image_process.cc
View File

@ -674,16 +674,16 @@ bool ExtractChannel(LiteMat &src, LiteMat &dst, int col) {
return false;
}
if (dst.data_type_ == LDataType::FLOAT32 || dst.data_type_ == LDataType::UINT8) {
if (src.data_type_ == LDataType::FLOAT32 || src.data_type_ == LDataType::UINT8) {
if (dst.IsEmpty() || dst.width_ != src.width_ || dst.height_ != src.height_ || dst.channel_ != 1 ||
dst.data_type_ != src.data_type_) {
dst.Init(src.width_, src.height_, 1, src.data_type_);
}
}
if (dst.data_type_ == LDataType::FLOAT32) {
if (src.data_type_ == LDataType::FLOAT32) {
ExtractChannelImpl<float>(src, dst, src.height_, src.width_, src.channel_, col);
} else if (dst.data_type_ == LDataType::UINT8) {
} else if (src.data_type_ == LDataType::UINT8) {
ExtractChannelImpl<uint8_t>(src, dst, src.height_, src.width_, src.channel_, col);
} else {
return false;

12
tests/ut/cpp/dataset/image_process_test.cc
View File

@ -408,7 +408,7 @@ TEST_F(MindDataImageProcess, TestPadd) {
size_t total_size = makeborder.height_ * makeborder.width_ * makeborder.channel_;
double distance = 0.0f;
for (size_t i = 0; i < total_size; i++) {
distance += pow((uint8_t)b_image.data[i] - ((uint8_t*)makeborder)[i], 2);
distance += pow((uint8_t)b_image.data[i] - ((uint8_t *)makeborder)[i], 2);
}
distance = sqrt(distance / total_size);
EXPECT_EQ(distance, 0.0f);
@ -439,7 +439,7 @@ TEST_F(MindDataImageProcess, TestPadZero) {
size_t total_size = makeborder.height_ * makeborder.width_ * makeborder.channel_;
double distance = 0.0f;
for (size_t i = 0; i < total_size; i++) {
distance += pow((uint8_t)b_image.data[i] - ((uint8_t*)makeborder)[i], 2);
distance += pow((uint8_t)b_image.data[i] - ((uint8_t *)makeborder)[i], 2);
}
distance = sqrt(distance / total_size);
EXPECT_EQ(distance, 0.0f);
@ -879,3 +879,11 @@ TEST_F(MindDataImageProcess, TestMultiplyFloat) {
static_cast<FLOAT32_C1 *>(dst_float.data_ptr_)[i].c1);
}
}
TEST_F(MindDataImageProcess, TestExtractChannel) {
LiteMat lite_single;
LiteMat lite_mat = LiteMat(1, 4, 3, LDataType::UINT16);
EXPECT_FALSE(ExtractChannel(lite_mat, lite_single, 0));
EXPECT_TRUE(lite_single.IsEmpty());
}