From 44dd5cdb24d51b8714692c69c74ec96025f1dffc Mon Sep 17 00:00:00 2001
From: suwenxiang <suwenxiang@huawei.com>
Date: Wed, 2 Nov 2022 12:07:36 +0800
Subject: [PATCH] Description: Utils missed round master modification IssueNo:
 https://gitee.com/openharmony/graphic_utils/issues/I5Z0FY Feature or Bugfix:
 Bugfix Binary Source: No Signed-off-by: suwenxiang <suwenxiang@huawei.com>

---
 .../gfx_utils/diagram/imagefilter/filter_blur.h    |  2 ++
 .../diagram/spancolorfill/fill_gradient.h          | 14 +++++++-------
 .../diagram/spancolorfill/fill_gradient_lut.h      |  4 ++--
 .../diagram/spancolorfill/fill_pattern_rgba.h      |  4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/interfaces/kits/gfx_utils/diagram/imagefilter/filter_blur.h b/interfaces/kits/gfx_utils/diagram/imagefilter/filter_blur.h
index 9393bc9..a4f669a 100644
--- a/interfaces/kits/gfx_utils/diagram/imagefilter/filter_blur.h
+++ b/interfaces/kits/gfx_utils/diagram/imagefilter/filter_blur.h
@@ -58,7 +58,9 @@ public:
             if (isGetRGBAIntegral) {
                 GetRGBAIntegralImage((uint8_t*)img.PixValuePtr(0, 0), width, height, stride);
             }
+#ifndef __ICCARM__
 #pragma omp parallel for
+#endif
             for (int32_t y = 0; y < height; y++) {
                 int32_t y1 = MATH_MAX(y - radius, 0);
                 int32_t y2 = MATH_MIN(y + radius + 1, height);
diff --git a/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient.h b/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient.h
index bd76dd6..c64d625 100644
--- a/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient.h
+++ b/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient.h
@@ -65,8 +65,8 @@ public:
         : interpolator_(&inter),
           gradientFunction_(&GradientFunction),
           colorFunction_(&ColorFunction),
-          distance1_(distance1 * GRADIENT_SUBPIXEL_SCALE),
-          distance2_(distance2 * GRADIENT_SUBPIXEL_SCALE) {}
+          distance1_(static_cast<int32_t>(distance1 * GRADIENT_SUBPIXEL_SCALE)),
+          distance2_(static_cast<int32_t>(distance2 * GRADIENT_SUBPIXEL_SCALE)) {}
 
     void Prepare() {}
 
@@ -121,9 +121,9 @@ public:
      * @param dy In the y-axis direction, the distance from the end circle center to the start circle center
      */
     GradientRadialCalculate(float endRadius, float dx, float dy)
-        : endRadius_(endRadius * GRADIENT_SUBPIXEL_SCALE),
-          dx_(dx * GRADIENT_SUBPIXEL_SCALE),
-          dy_(dy * GRADIENT_SUBPIXEL_SCALE)
+        : endRadius_(static_cast<int32_t>(endRadius * GRADIENT_SUBPIXEL_SCALE)),
+          dx_(static_cast<int32_t>(dx * GRADIENT_SUBPIXEL_SCALE)),
+          dy_(static_cast<int32_t>(dy * GRADIENT_SUBPIXEL_SCALE))
     {
         UpdateValues();
     }
@@ -149,9 +149,9 @@ public:
         if (deltaRadius < 1) {
             deltaRadius = 1;
         }
-        int16_t index = (((dx * dx_ + dy * dy_ +
+        int16_t index = static_cast<int16_t>((((dx * dx_ + dy * dy_ +
                         Sqrt(fabs(radiusDistance)))
-                        * mul_ - startRadius) * size) / deltaRadius;
+                        * mul_ - startRadius) * size) / deltaRadius);
         if (index < 0) {
             index = 0;
         }
diff --git a/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient_lut.h b/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient_lut.h
index 1644081..6bb3649 100644
--- a/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient_lut.h
+++ b/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient_lut.h
@@ -81,7 +81,7 @@ public:
         colorProfile_.ReSize(RemoveDuplicates(colorProfile_, OffsetEqual));
         if (colorProfile_.Size() > 1) {
             uint32_t index;
-            uint32_t start = colorProfile_[0].offset * colorLutSize_;
+            uint32_t start = static_cast<uint32_t>(colorProfile_[0].offset * colorLutSize_);
             uint32_t end;
             Rgba8T color = colorProfile_[0].color;
 
@@ -95,7 +95,7 @@ public:
              * From 1 to colorprofile Interpolation color calculation between size ()
              */
             for (index = 1; index < colorProfile_.Size(); index++) {
-                end = colorProfile_[index].offset * colorLutSize_;
+                end = static_cast<uint32_t>(colorProfile_[index].offset * colorLutSize_);
                 ColorInterpolator ci(colorProfile_[index - 1].color,
                                      colorProfile_[index].color,
                                      end - start + 1);
diff --git a/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_pattern_rgba.h b/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_pattern_rgba.h
index 267261d..3255ec1 100644
--- a/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_pattern_rgba.h
+++ b/interfaces/kits/gfx_utils/diagram/spancolorfill/fill_pattern_rgba.h
@@ -76,8 +76,8 @@ public:
 
     void Generate(Rgba8T* span, int32_t x, int32_t y, uint32_t len)
     {
-        y = y - patternStartY_;
-        x = x - patternStartX_;
+        y = static_cast<int32_t>(y - patternStartY_);
+        x = static_cast<int32_t>(x - patternStartX_);
         for (; len; --len, span++, x++) {
             if (patternRepeat_ == NO_REPEAT) {
                 if (x >= patternImagewidth_ ||