From 6f8e94abd0380ed8a02854e7ab4257f4d61709a5 Mon Sep 17 00:00:00 2001
From: shenwei41 <shenwei41@huawei.com>
Date: Fri, 23 Oct 2020 14:59:50 +0800
Subject: [PATCH] Modify calibration parameters

---
 .../ccsrc/minddata/dataset/api/vision.cc      | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/mindspore/ccsrc/minddata/dataset/api/vision.cc b/mindspore/ccsrc/minddata/dataset/api/vision.cc
index 7fd240ac4a..6a1441f870 100644
--- a/mindspore/ccsrc/minddata/dataset/api/vision.cc
+++ b/mindspore/ccsrc/minddata/dataset/api/vision.cc
@@ -427,6 +427,12 @@ bool CropOperation::ValidateParams() {
       return false;
     }
   }
+  for (int j = 0; j < coordinates_.size(); ++j) {
+    if (coordinates_[j] < 0) {
+      MS_LOG(ERROR) << "Crop: invalid coordinates, coordinates must be greater than 0, got: " << coordinates_[j];
+      return false;
+    }
+  }
   return true;
 }
 
@@ -437,7 +443,10 @@ std::shared_ptr<TensorOp> CropOperation::Build() {
   y = coordinates_[1];
 
   height = size_[0];
-  width = size_[1];
+  width = size_[0];
+  if (size_.size() == 2) {
+    width = size_[1];
+  }
 
   std::shared_ptr<CropOp> tensor_op = std::make_shared<CropOp>(x, y, height, width);
   return tensor_op;
@@ -879,7 +888,13 @@ std::shared_ptr<TensorOp> RandomCropDecodeResizeOperation::Build() {
 // RandomHorizontalFlipOperation
 RandomHorizontalFlipOperation::RandomHorizontalFlipOperation(float probability) : probability_(probability) {}
 
-bool RandomHorizontalFlipOperation::ValidateParams() { return true; }
+bool RandomHorizontalFlipOperation::ValidateParams() {
+  if (probability_ < 0.0 || probability_ > 1.0) {
+    MS_LOG(ERROR) << "RandomHorizontalFlip: probability must be between 0.0 and 1.0.";
+    return false;
+  }
+  return true;
+}
 
 std::shared_ptr<TensorOp> RandomHorizontalFlipOperation::Build() {
   std::shared_ptr<RandomHorizontalFlipOp> tensor_op = std::make_shared<RandomHorizontalFlipOp>(probability_);
@@ -1024,7 +1039,13 @@ std::shared_ptr<TensorOp> RandomSolarizeOperation::Build() {
 // RandomVerticalFlipOperation
 RandomVerticalFlipOperation::RandomVerticalFlipOperation(float probability) : probability_(probability) {}
 
-bool RandomVerticalFlipOperation::ValidateParams() { return true; }
+bool RandomVerticalFlipOperation::ValidateParams() {
+  if (probability_ < 0.0 || probability_ > 1.0) {
+    MS_LOG(ERROR) << "RandomVerticalFlip: probability must be between 0.0 and 1.0.";
+    return false;
+  }
+  return true;
+}
 
 std::shared_ptr<TensorOp> RandomVerticalFlipOperation::Build() {
   std::shared_ptr<RandomVerticalFlipOp> tensor_op = std::make_shared<RandomVerticalFlipOp>(probability_);