From 48ec178e77de9980ba95204f5d3f83e284b1c62e Mon Sep 17 00:00:00 2001
From: islam_amin <islam.amin@huawei.com>
Date: Thu, 23 Jul 2020 14:32:37 -0400
Subject: [PATCH] Fixing AutoContrast/Equalize Bug

---
 .../dataset/kernels/image/image_utils.cc        |   5 +++--
 .../dataset/golden/autcontrast_01_result_c.npz  | Bin 607 -> 607 bytes
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc
index c40090f996..f0f2fcb852 100644
--- a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc
+++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc
@@ -679,9 +679,10 @@ Status AutoContrast(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor
     }
     cv::Mat result;
     cv::merge(image_result, result);
+    result.convertTo(result, input_cv->mat().type());
     std::shared_ptr<CVTensor> output_cv = std::make_shared<CVTensor>(result);
-    if (input_cv->Rank() == 2) output_cv->Squeeze();
     (*output) = std::static_pointer_cast<Tensor>(output_cv);
+    (*output)->Reshape(input->shape());
   } catch (const cv::Exception &e) {
     RETURN_STATUS_UNEXPECTED("Error in auto contrast");
   }
@@ -781,8 +782,8 @@ Status Equalize(const std::shared_ptr<Tensor> &input, std::shared_ptr<Tensor> *o
     cv::Mat result;
     cv::merge(image_result, result);
     std::shared_ptr<CVTensor> output_cv = std::make_shared<CVTensor>(result);
-    if (input_cv->Rank() == 2) output_cv->Squeeze();
     (*output) = std::static_pointer_cast<Tensor>(output_cv);
+    (*output)->Reshape(input->shape());
   } catch (const cv::Exception &e) {
     RETURN_STATUS_UNEXPECTED("Error in equalize.");
   }
diff --git a/tests/ut/data/dataset/golden/autcontrast_01_result_c.npz b/tests/ut/data/dataset/golden/autcontrast_01_result_c.npz
index 16b8642b9723b89c23e44a3a26525ccfdd96c79d..062fc9a48b3eff850d0f57331ab326670ecde513 100644
GIT binary patch
delta 81
zcmcc5a-T&gz?+#xgaHB+8K#D4nQs(&%xEa3b@{=&lLay<C#T5N?P%{TR4ge}N=i&E
VDO66<3-D%S5@ANwHCc_x5&){?6|evR

delta 81
zcmcc5a-T&gz?+#xgaHB+8C1k|)i(+~W;DEAJmIH8)X$4Q_SFcSTlQV9P_d*?DJe0v
Vq)<6YFTk6TNrV|y*JL#&O8~*26~h1k