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

!24349 dataset: put check before resize operation 

Merge pull request !24349 from ms_yan/code_check
This commit is contained in:
i-robot 2021-09-29 01:00:35 +00:00 committed by Gitee
parent 5a66edf1cf 02234b90c5
commit 77eb79f3e6
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc
View File

@ -144,21 +144,6 @@ Status Resize(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *out
}
RETURN_IF_NOT_OK(ValidateImageRank("Resize", input_cv->Rank()));
if (mode == InterpolationMode::kCubicPil) {
LiteMat imIn, imOut;
std::shared_ptr<Tensor> output_tensor;
TensorShape new_shape = TensorShape({output_height, output_width, 3});
RETURN_IF_NOT_OK(Tensor::CreateEmpty(new_shape, input_cv->type(), &output_tensor));
uint8_t *buffer = reinterpret_cast<uint8_t *>(&(*output_tensor->begin<uint8_t>()));
imOut.Init(output_width, output_height, input_cv->shape()[2], reinterpret_cast<void *>(buffer), LDataType::UINT8);
imIn.Init(input_cv->shape()[1], input_cv->shape()[0], input_cv->shape()[2], input_cv->mat().data, LDataType::UINT8);
if (ResizeCubic(imIn, imOut, output_width, output_height) == false) {
RETURN_STATUS_UNEXPECTED("Resize: failed to do resize, please check the error msg.");
}
*output = output_tensor;
return Status::OK();
}
cv::Mat in_image = input_cv->mat();
const uint32_t kResizeShapeLimits = 1000;
// resize image too large or too small, 1000 is arbitrarily chosen here to prevent open cv from segmentation fault
@ -174,6 +159,21 @@ Status Resize(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *out
std::string err_msg = "Resize: the resizing width or height is invalid, width or height is zero.";
return Status(StatusCode::kMDShapeMisMatch, err_msg);
}
if (mode == InterpolationMode::kCubicPil) {
LiteMat imIn, imOut;
std::shared_ptr<Tensor> output_tensor;
TensorShape new_shape = TensorShape({output_height, output_width, 3});
RETURN_IF_NOT_OK(Tensor::CreateEmpty(new_shape, input_cv->type(), &output_tensor));
uint8_t *buffer = reinterpret_cast<uint8_t *>(&(*output_tensor->begin<uint8_t>()));
imOut.Init(output_width, output_height, input_cv->shape()[2], reinterpret_cast<void *>(buffer), LDataType::UINT8);
imIn.Init(input_cv->shape()[1], input_cv->shape()[0], input_cv->shape()[2], input_cv->mat().data, LDataType::UINT8);
if (ResizeCubic(imIn, imOut, output_width, output_height) == false) {
RETURN_STATUS_UNEXPECTED("Resize: failed to do resize, please check the error msg.");
}
*output = output_tensor;
return Status::OK();
}
try {
TensorShape shape{output_height, output_width};
int num_channels = input_cv->shape()[CHANNEL_INDEX];