Description: Code alarm processing#4

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5W2LG
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: youbing54<youbing3@huawei.com>

frameworks/diagram/rasterizer/rasterizer_cells_antialias.cpp

@@ -331,8 +331,9 @@ void RasterizerCellsAntiAlias::LineOperate(int32_t x1, int32_t y1, int32_t x2, i
     RenderHorizonline(ey1, xFrom, POLY_SUBPIXEL_SCALE - first, x2, submaskFlagsY2);
 }
 
-void RasterizerCellsAntiAlias::RenderVerticalLine(int32_t& x1, int32_t& ex1, int64_t& dy, int32_t& first, int32_t& increase, int32_t& xFrom,
-                                                  int32_t& submaskFlagsY1, int32_t& submaskFlagsY2, int32_t& ey1, int32_t& ey2, int32_t& delta)
+void RasterizerCellsAntiAlias::RenderVerticalLine(int32_t& x1, int32_t& ex1, int64_t& dy, int32_t& first,
+                                                  int32_t& increase, int32_t& xFrom, int32_t& submaskFlagsY1,
+                                                  int32_t& submaskFlagsY2, int32_t& ey1, int32_t& ey2, int32_t& delta)
 {
     /**
      * The coordinates of the first 24 bits are extracted from the points in units of 1 / 256 pixels
@@ -370,8 +371,9 @@ void RasterizerCellsAntiAlias::RenderVerticalLine(int32_t& x1, int32_t& ex1, int
     currCell_.area += twoFx * delta;
 }
 
-void RasterizerCellsAntiAlias::RenderObliqueLine(int64_t& dx, int64_t& dy, int32_t& first, int32_t& increase, int32_t& xFrom,
-                                                 int64_t& deltaxMask, int32_t& ey1, int32_t& ey2, int32_t& delta)
+void RasterizerCellsAntiAlias::RenderObliqueLine(int64_t& dx, int64_t& dy, int32_t& first,
+                                                 int32_t& increase, int32_t& xFrom, int64_t& deltaxMask,
+                                                 int32_t& ey1, int32_t& ey2, int32_t& delta)
 {
     int32_t remDyMask, liftDyMask;
     deltaxMask = POLY_SUBPIXEL_SCALE * dx;

frameworks/diagram/vertexgenerate/vertex_generate_dash.cpp

@@ -18,7 +18,7 @@
 #include "gfx_utils/diagram/vertexprimitive/geometry_shorten_path.h"
 
 namespace OHOS {
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
 VertexGenerateDash::VertexGenerateDash()
     : totalDashLen_(0.0f),
       numDashes_(0),

frameworks/diagram/vertexgenerate/vertex_generate_stroke.cpp

@@ -130,7 +130,7 @@ void VertexGenerateStroke::VertexReady(const uint32_t& verticesNum, uint32_t& cm
 
 void VertexGenerateStroke::VertexLineCapStart()
 {
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     stroker_.CalcCap(outVertices_,
                      srcVertices_[0],
                      srcVertices_[1],
@@ -144,7 +144,7 @@ void VertexGenerateStroke::VertexLineCapStart()
 
 void VertexGenerateStroke::VertexLineCapEnd(const uint32_t& verticesNum)
 {
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     stroker_.CalcCap(outVertices_,
                      srcVertices_[srcVertices_.Size() - 1],
                      srcVertices_[srcVertices_.Size() - verticesNum],
@@ -166,7 +166,7 @@ void VertexGenerateStroke::VertexLineJoinStart()
         status_ = LINECAP_END;
         return;
     }
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     stroker_.CalcJoin(outVertices_,
                       srcVertices_.Prev(srcVertex_),
                       srcVertices_.Curr(srcVertex_),
@@ -188,7 +188,7 @@ void VertexGenerateStroke::VertexLineJoinEnd()
         return;
     }
     --srcVertex_;
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     stroker_.CalcJoin(outVertices_,
                       srcVertices_.Next(srcVertex_),
                       srcVertices_.Curr(srcVertex_),

frameworks/diagram/vertexprimitive/geometry_arc.cpp

@@ -15,7 +15,7 @@
 
 #include "gfx_utils/diagram/vertexprimitive/geometry_arc.h"
 namespace OHOS {
-#if GRAPHIC_ENABLE_ARC_FLAG
+#if defined(GRAPHIC_ENABLE_ARC_FLAG) && GRAPHIC_ENABLE_ARC_FLAG
 const int32_t CURVERENUMSTEP = 4;
 GeometryArc::GeometryArc(float centerX, float centerY,
                          float rx, float ry,

frameworks/diagram/vertexprimitive/geometry_bezier_arc.cpp

@@ -16,7 +16,7 @@
 #include "gfx_utils/diagram/vertexprimitive/geometry_bezier_arc.h"
 
 namespace OHOS {
-#if GRAPHIC_ENABLE_BEZIER_ARC_FLAG
+#if defined(GRAPHIC_ENABLE_BEZIER_ARC_FLAG) && GRAPHIC_ENABLE_BEZIER_ARC_FLAG
 const uint16_t BEZIER_ARC_SETUP = 2;
 
 const uint16_t BEZIER_ARC_VERTICES_SIZE_STEP = 6;
@@ -53,7 +53,7 @@ void ArcToBezier(float cx, float cy, float rx, float ry,
     px[3] = x0;
     py[3] = y0;
 
-    float cosVal = Cos((startAngle + sweepAngle / FLOATNUM) * RADIAN_TO_ANGLE );
+    float cosVal = Cos((startAngle + sweepAngle / FLOATNUM) * RADIAN_TO_ANGLE);
     float sinVal = Sin((startAngle + sweepAngle / FLOATNUM) * RADIAN_TO_ANGLE);
 
     for (uint16_t i = 0; i < BEZIER_ARC_POINTS; i++) {

frameworks/graphic_math.cpp

@@ -14,12 +14,12 @@
  */
 
 #include "gfx_utils/graphic_math.h"
-#if ENABLE_CMATH
+#if defined(ENABLE_CMATH) && ENABLE_CMATH
 #include <cmath>
 #endif
 
 namespace OHOS {
-#if !ENABLE_CMATH
+#if defined(ENABLE_CMATH) && !ENABLE_CMATH
 static float g_sinValues[] = {
     0.000000, 0.017452, 0.034899, 0.052336, 0.069756, 0.087156, 0.104528, 0.121869, 0.139173, 0.156434, 0.173648,
     0.190809, 0.207912, 0.224951, 0.241922, 0.258819, 0.275637, 0.292372, 0.309017, 0.325568, 0.342020, 0.358368,
@@ -35,7 +35,7 @@ static float g_sinValues[] = {
 
 float Sin(float angle)
 {
-#if ENABLE_CMATH
+#if defined(ENABLE_CMATH) && ENABLE_CMATH
     float radian =  angle / RADIAN_TO_ANGLE;
     return sin(radian);
 #else
@@ -64,7 +64,7 @@ float Fmod(float X, float Y)
 
 float Cos(float angle)
 {
-#if ENABLE_CMATH
+#if defined(ENABLE_CMATH) && ENABLE_CMATH
     return cos(angle / RADIAN_TO_ANGLE);
 #else
     Sin(QUARTER_IN_DEGREE - angle);
@@ -73,7 +73,7 @@ float Cos(float angle)
 
 float Acos(float value)
 {
-#if ENABLE_CMATH
+#if defined(ENABLE_CMATH) && ENABLE_CMATH
     return acos(value);
 #else
     float result, l, r;
@@ -82,9 +82,9 @@ float Acos(float value)
     result = (l + r) / 2;
     while (MATH_ABS(Sin(QUARTER_IN_DEGREE - result * RADIAN_TO_ANGLE) - value) > UI_FLT_EPSILON) {
         if (Sin(QUARTER_IN_DEGREE - result * RADIAN_TO_ANGLE) - value > UI_FLT_EPSILON) {
-           l = result;
+            l = result;
         } else {
-           r = result;
+            r = result;
         }
         result = (l + r) / 2;
     }
@@ -132,7 +132,7 @@ float FastAtan2F(float y, float x)
 {
     float absX = MATH_ABS(x);
     float absY = MATH_ABS(y);
-    if (absY < UI_FLT_EPSILON && absX < UI_FLT_EPSILON){
+    if (absY < UI_FLT_EPSILON && absX < UI_FLT_EPSILON) {
         return 0;
     }
     float t;
@@ -145,14 +145,14 @@ float FastAtan2F(float y, float x)
     } else {
         t = (absY) / absX;
         t2 = t * t;
-        angle = (t * (1 + t2 * (ATAN2_P3 + t2 * (ATAN2_P5 + t2 * ATAN2_P7))) );
+        angle = (t * (1 + t2 * (ATAN2_P3 + t2 * (ATAN2_P5 + t2 * ATAN2_P7))));
     }
 
     if (y < 0) {
         if (x < 0) {
-            angle = - UI_PI + angle;
+            angle = -UI_PI + angle;
         } else {
-            angle = - angle;
+            angle = -angle;
         }
     } else if (x < 0) {
         angle =  UI_PI - angle;

interfaces/innerkits/graphic_config.h

@@ -38,7 +38,7 @@
 #ifndef GRAPHIC_LITE_GRAPHIC_CONFIG_H
 #define GRAPHIC_LITE_GRAPHIC_CONFIG_H
 
-#if (ENABLE_OHOS_GRAPHIC_UTILS_PRODUCT_CONFIG == 1)
+#if defined(ENABLE_OHOS_GRAPHIC_UTILS_PRODUCT_CONFIG) && (ENABLE_OHOS_GRAPHIC_UTILS_PRODUCT_CONFIG == 1)
 #include "product_graphic_lite_config.h"
 #endif
 

interfaces/kits/gfx_utils/color.h

@@ -39,7 +39,7 @@
 #include "gfx_utils/heap_base.h"
 #include "graphic_config.h"
 #include "graphic_math.h"
-#if ENABLE_ARM_MATH
+#if defined(ENABLE_ARM_MATH) && ENABLE_ARM_MATH
 #include "arm_math.h"
 #endif
 namespace OHOS {
@@ -112,9 +112,9 @@ typedef union {
     uint32_t full;
 } Color32;
 
-#if COLOR_DEPTH == 16
+#if defined(COLOR_DEPTH) && COLOR_DEPTH == 16
 using ColorType = Color16;
-#elif COLOR_DEPTH == 32
+#elif defined(COLOR_DEPTH) && COLOR_DEPTH == 32
 using ColorType = Color32;
 #else
 #    error "Invalid COLOR_DEPTH, Set it to 16 or 32!"
@@ -251,7 +251,7 @@ struct Rgba {
         }
         return *this;
     }
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
     /**
      * @brief Gradual change.
      *
@@ -450,7 +450,7 @@ struct Rgba8T {
         BASE_MSB = 1 << (BASE_SHIFT - 1)
     };
 
-    Rgba8T() {}
+    Rgba8T() : red(0), green(0), blue(0), alpha(0) {}
 
     /**
      * @brief Rgba8T Constructor
@@ -577,7 +577,7 @@ struct Rgba8T {
 
     static inline uint8_t Multiply(uint8_t valueA, uint8_t valueB)
     {
-#if ENABLE_ARM_MATH
+#if defined(ENABLE_ARM_MATH) && ENABLE_ARM_MATH
         uint32_t uint32_t = __SMUAD(valueA, valueB) + BASE_MSB;
 #else
         uint32_t uint32_t = valueA * valueB + BASE_MSB;
@@ -596,7 +596,7 @@ struct Rgba8T {
                 valueB = 1;
             }
 
-#if ENABLE_ARM_MATH
+#if defined(ENABLE_ARM_MATH) && ENABLE_ARM_MATH
             return uint8_t(__UDIV(__SMUAD(valueA, BASE_MASK) + (valueB >> 1), valueB));
 #else
             return uint8_t((valueA * BASE_MASK + (valueB >> 1)) / valueB);
@@ -621,7 +621,7 @@ struct Rgba8T {
 
     static inline uint8_t Lerp(uint8_t valueP, uint8_t valueQ, uint8_t valueA)
     {
-#if ENABLE_ARM_MATH
+#if defined(ENABLE_ARM_MATH) && ENABLE_ARM_MATH
         int32_t t = __SMUAD((valueQ - valueP), valueA) + BASE_MSB - (valueP > valueQ);
 #else
         int32_t t = (valueQ - valueP) * valueA + BASE_MSB - (valueP > valueQ);
@@ -654,7 +654,7 @@ struct Rgba8T {
     {
         return alpha / BASE_MASK;
     }
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
     /**
      * @brief Gradient, calculate the new rgba8t object according to the change coefficient
      *

interfaces/kits/gfx_utils/common_macros.h

@@ -21,27 +21,27 @@
 #define UI_WEAK_SYMBOL
 #endif
 
-#define _ALIGN_UP(sz, align) (((sz) + (align - 1)) & (-(align)))
-#define _ALIGN_DOWN(sz, align) ((sz) & (-(align)))
+#define ALIGN_UP(sz, align) (((sz) + (align - 1)) & (-(align)))
+#define ALIGN_DOWN(sz, align) ((sz) & (-(align)))
 #define _ADDR_ALIGN(ptr, sz, align)                                  \
     do {                                                             \
-        uint32_t _sz = _ALIGN_DOWN(sz, align);                       \
+        uint32_t _sz = ALIGN_DOWN(sz, align);                       \
         (ptr) = decltype(ptr)((uintptr_t)(void*)(ptr) + ((sz)-_sz)); \
         (sz) = _sz;                                                  \
     } while (0);
-#define _STRUCT_ALIGN(sz) alignas(sz)
+#define STRUCT_ALIGN(sz) alignas(sz)
 
 #ifdef ALIGNMENT_BYTES
 #if (ALIGNMENT_BYTES != 0) && ((ALIGNMENT_BYTES & (ALIGNMENT_BYTES - 1)) != 0)
 #error ALIGNMENT_BYTES should be power of 2.
 #endif
-#define UI_ALIGN_UP(size) _ALIGN_UP((size), ALIGNMENT_BYTES)
-#define UI_ALIGN_DOWN(size) _ALIGN_DOWN((size), ALIGNMENT_BYTES)
+#define UI_ALIGN_UP(size) ALIGN_UP((size), ALIGNMENT_BYTES)
+#define UI_ALIGN_DOWN(size) ALIGN_DOWN((size), ALIGNMENT_BYTES)
 #define UI_ADDR_ALIGN(ptr, sz) _ADDR_ALIGN(ptr, sz, ALIGNMENT_BYTES)
-#define UI_STRUCT_ALIGN _STRUCT_ALIGN(ALIGNMENT_BYTES)
+#define UI_STRUCT_ALIGN STRUCT_ALIGN(ALIGNMENT_BYTES)
 #else
-#define UI_ALIGN_UP(size)  _ALIGN_UP((size), 4U)
-#define UI_ALIGN_DOWN(size) _ALIGN_DOWN((size), 4U)
+#define UI_ALIGN_UP(size)  ALIGN_UP((size), 4U)
+#define UI_ALIGN_DOWN(size) ALIGN_DOWN((size), 4U)
 #define UI_ADDR_ALIGN(ptr, sz)
 #define UI_STRUCT_ALIGN
 #endif

interfaces/kits/gfx_utils/diagram/common/paint.h

@@ -45,34 +45,34 @@ public:
           opacity_(OPA_OPAQUE),
           strokeWidth_(DEFAULT_STROKE_WIDTH),
           changeFlag_(false),
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
           lineJoin_(LineJoin::ROUND_JOIN),
 #endif
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
           lineCap_(LineCap::BUTT_CAP),
 #endif
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
           isDashMode_(false),
           dashOffset_(0),
           dashArray_(nullptr),
           ndashes_(0),
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
           miterLimit_(0),
 #endif
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
           linearGradientPoint_({0, 0, 0, 0}),
           radialGradientPoint_({0, 0, 0, 0, 0, 0}),
           stopAndColors_({}),
           gradientflag_(Linear),
 #endif
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
           patternRepeat_(REPEAT),
 #endif
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
           image_(nullptr),
 #endif
-#if GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
+#if defined(GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG) && GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
           shadowBlurRadius_(0),
           shadowOffsetX_(0.0f),
           shadowOffsetY_(0.0f),
@@ -96,7 +96,7 @@ public:
     }
     void InitDash(const Paint& paint)
     {
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
         if (isDashMode_ && ndashes_ > 0) {
             dashArray_ = new float[ndashes_];
             if (dashArray_) {
@@ -142,13 +142,13 @@ public:
         strokeColor_ = paint.strokeColor_;
         strokeWidth_ = paint.strokeWidth_;
         opacity_ = paint.opacity_;
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
         lineCap_ = paint.lineCap_;
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
         lineJoin_ = paint.lineJoin_;
 #endif
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
         isDashMode_ = paint.isDashMode_;
         dashOffset_ = paint.dashOffset_;
         dashArray_ = paint.dashArray_;
@@ -160,19 +160,19 @@ public:
         translationX_ = paint.translationX_;
         translationY_ = paint.translationY_;
         InitDash(paint);
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
         miterLimit_ = paint.miterLimit_;
 #endif
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
         linearGradientPoint_ = paint.linearGradientPoint_;
         radialGradientPoint_ = paint.radialGradientPoint_;
         stopAndColors_ = paint.stopAndColors_;
         gradientflag_ = paint.gradientflag_;
 #endif
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
         patternRepeat_ = paint.patternRepeat_;
 #endif
-#if GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
+#if defined(GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG) && GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
         shadowBlurRadius_ = paint.shadowBlurRadius_;
         shadowOffsetX_ = paint.shadowOffsetX_;
         shadowOffsetY_ = paint.shadowOffsetY_;
@@ -442,7 +442,7 @@ public:
     {
         return changeFlag_;
     }
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     /**
      * @brief Sets the cap type.
      * @see GetLineCap
@@ -456,7 +456,7 @@ public:
     }
 #endif
 
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     /**
      * @brief Gets the cap type.
      * @see SetLineCap
@@ -468,7 +468,7 @@ public:
         return lineCap_;
     }
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     /**
      * @brief Sets the style at the path connection of the pen.
      * @see GetLineJoin
@@ -481,7 +481,7 @@ public:
         changeFlag_ = true;
     }
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     /**
      * @brief Sets the spacing limit for sharp corners at path connections.
      * @see GetMiterLimit
@@ -494,13 +494,13 @@ public:
         changeFlag_ = true;
     }
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     float GetMiterLimit() const
     {
         return miterLimit_;
     }
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     /**
      * @brief Gets the style at the path connection of the pen.
      * @see SetLineJoin
@@ -512,7 +512,7 @@ public:
         return lineJoin_;
     }
 #endif
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
     bool IsLineDash() const
     {
         return isDashMode_;
@@ -599,7 +599,7 @@ public:
         }
     }
 #endif
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
     void createLinearGradient(float startx, float starty, float endx, float endy)
     {
         gradientflag_ = Linear;
@@ -650,7 +650,7 @@ public:
         return gradientflag_;
     }
 #endif
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
     /*
      * Set hatch patterns for elements
      * @param img Represents the pattern of the hatch，text Represents a fill pattern
@@ -673,7 +673,7 @@ public:
     }
 #endif
 
-#if GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
+#if defined(GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG) && GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
     /**
      * @brief Sets the shadow blur level.
      * @since 1.0
@@ -975,7 +975,7 @@ public:
         return haveComposite_;
     }
 
-#if GRAPHIC_ENABLE_BLUR_EFFECT_FLAG
+#if defined(GRAPHIC_ENABLE_BLUR_EFFECT_FLAG) && GRAPHIC_ENABLE_BLUR_EFFECT_FLAG
     Filterblur drawBlur;
     Filterblur GetDrawBoxBlur() const
     {
@@ -990,35 +990,35 @@ private:
     uint8_t opacity_;
     uint16_t strokeWidth_;
     bool changeFlag_;
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     LineJoin lineJoin_;
 #endif
 
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     LineCap lineCap_;
 #endif
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
     bool isDashMode_;  // Is it a dash mode segment.
     float dashOffset_; // dash Point offset.
     float* dashArray_; // dash Point array.
     uint32_t ndashes_; // Length of dasharray
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     float miterLimit_; // Sets the spacing limit for sharp corners at path connections
 #endif
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
     LinearGradientPoint linearGradientPoint_;
     RadialGradientPoint radialGradientPoint_;
     List<StopAndColor> stopAndColors_;
     Gradient gradientflag_;
 #endif
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
     PatternRepeatMode patternRepeat_;
 #endif
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
     const char* image_;
 #endif
-#if GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
+#if defined(GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG) && GRAPHIC_ENABLE_SHADOW_EFFECT_FLAG
     uint16_t shadowBlurRadius_; // Sets the shadow blur radius.
     float shadowOffsetX_;       // Sets the abscissa offset of the shadow.
     float shadowOffsetY_;       // Sets the shadow ordinate offset.

interfaces/kits/gfx_utils/diagram/depiction/depict_adaptor_vertex_generate.h

@@ -231,7 +231,7 @@ uint32_t DepictAdaptorVertexGenerate<VertexSource, Generator, Markers>::Generate
                     return PATH_CMD_STOP;
                 }
                 markers_.AddVertex(startX_, startY_, PATH_CMD_MOVE_TO);
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
                 generator_.RemoveAll();
                 generator_.AddVertex(startX_, startY_, PATH_CMD_MOVE_TO);
 
@@ -281,7 +281,7 @@ void DepictAdaptorVertexGenerate<VertexSource, Generator, Markers>::VertexAccumu
                 break;
             }
             markers_.AddVertex(*x, *y, PATH_CMD_LINE_TO);
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
             generator_.AddVertex(*x, *y, cmd);
 #else
             if (generator_.GetGenerateFlags() != VertexGenerateFlags::GENERATE_DASH) {
@@ -294,7 +294,7 @@ void DepictAdaptorVertexGenerate<VertexSource, Generator, Markers>::VertexAccumu
                 break;
             }
             if (IsEndPoly(cmd)) {
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
                 generator_.AddVertex(*x, *y, cmd);
 #else
                 if (generator_.GetGenerateFlags() != VertexGenerateFlags::GENERATE_DASH) {

interfaces/kits/gfx_utils/diagram/depiction/depict_dash.h

@@ -42,7 +42,7 @@ using GenerateDash = VertexGenerateDash;
  * @version 1.0
  */
 struct DepictDash : public DepictAdaptorVertexGenerate<DepictCurve, GenerateDash, EmptyMarkers> {
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
     using BaseType = DepictAdaptorVertexGenerate<DepictCurve, GenerateDash, EmptyMarkers>;
 
     DepictDash(DepictCurve& vs) : DepictAdaptorVertexGenerate<DepictCurve, GenerateDash, EmptyMarkers>(vs) {}

interfaces/kits/gfx_utils/diagram/depiction/depict_stroke.h

@@ -44,7 +44,7 @@ struct DepictStroke
         : DepictAdaptorVertexGenerate<VertexSource, VertexGenerateStroke>(vs)
     {
     }
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     /**
      * ineCap Property sets the style of the line end cap.
      * butt Default. Add a straight edge to each end of the line.
@@ -69,7 +69,7 @@ struct DepictStroke
         return BaseType::GetGenerator().GetLineCap();
     }
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     /**
      * lineJoin Property sets the type of corner created. When two lines meet,
      * Mainly including bevel Create a bevel. round Create a fillet.

interfaces/kits/gfx_utils/diagram/imagefilter/filter_blur.h

@@ -22,7 +22,7 @@
 
 namespace OHOS {
 class Filterblur {
-#if GRAPHIC_ENABLE_BLUR_EFFECT_FLAG
+#if defined(GRAPHIC_ENABLE_BLUR_EFFECT_FLAG) && GRAPHIC_ENABLE_BLUR_EFFECT_FLAG
 
 public:
     Filterblur()

interfaces/kits/gfx_utils/diagram/rasterizer/rasterizer_cells_antialias.h

@@ -194,11 +194,14 @@ private:
      */
     void RenderHorizonline(int32_t ey, int32_t x1, int32_t submaskFlagsY1, int32_t x2, int32_t submaskFlagsY2);
 
-    void RenderVerticalLine(int32_t& x1, int32_t& ex1, int64_t& dy, int32_t& first, int32_t& increase, int32_t& xFrom,
-                            int32_t& submaskFlagsY1, int32_t& submaskFlagsY2, int32_t& ey1, int32_t& ey2, int32_t& delta);
+    void RenderVerticalLine(int32_t& x1, int32_t& ex1, int64_t& dy, int32_t& first,
+                            int32_t& increase, int32_t& xFrom, int32_t& submaskFlagsY1,
+                            int32_t& submaskFlagsY2, int32_t& ey1, int32_t& ey2, int32_t& delta);
+
+    void RenderObliqueLine(int64_t& dx, int64_t& dy, int32_t& first,
+                           int32_t& increase, int32_t& xFrom, int64_t& deltaxMask,
+                           int32_t& ey1, int32_t& ey2, int32_t& delta);
 
-    void RenderObliqueLine(int64_t& dx, int64_t& dy, int32_t& first, int32_t& increase, int32_t& xFrom,
-                           int64_t& deltaxMask, int32_t& ey1, int32_t& ey2, int32_t& delta);
     /**
      * @brief Allocate array space for cells during rasterization.
      * @since 1.0

interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient.h

@@ -45,7 +45,7 @@ public:
  * @ColorF Color array
  */
 class FillGradient : public SpanBase {
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
 public:
     FillGradient() {}
     /**

interfaces/kits/gfx_utils/diagram/spancolorfill/fill_gradient_lut.h

@@ -40,7 +40,7 @@ const uint16_t COLOR_LUT_SIZE = 512;
 * @version 1.0
 */
 class FillGradientLut {
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
 public:
     FillGradientLut() : colorType_(COLOR_LUT_SIZE), colorLutSize_(COLOR_LUT_SIZE), colorProfile_(COLOR_PROFILE_SIZE) {}
     /**

interfaces/kits/gfx_utils/diagram/spancolorfill/fill_interpolator.h

@@ -34,7 +34,7 @@ const uint8_t SUB_PIXEL_SHIFT = 8;
  * Gradient color interpolator
  */
 struct ColorInterpolator {
-#if GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_GRADIENT_FILL_FLAG) && GRAPHIC_ENABLE_GRADIENT_FILL_FLAG
 public:
 
     ColorInterpolator(const Rgba8T& color1, const Rgba8T& color2, uint32_t distance)

interfaces/kits/gfx_utils/diagram/spancolorfill/fill_pattern_rgba.h

@@ -27,7 +27,7 @@
 
 namespace OHOS {
 class FillPatternRgba : public SpanBase {
-#if GRAPHIC_ENABLE_PATTERN_FILL_FLAG
+#if defined(GRAPHIC_ENABLE_PATTERN_FILL_FLAG) && GRAPHIC_ENABLE_PATTERN_FILL_FLAG
 public:
     FillPatternRgba() {}
 

interfaces/kits/gfx_utils/diagram/vertexgenerate/vertex_generate_dash.h

@@ -25,7 +25,7 @@ namespace OHOS {
  * @version 1.0
  */
 class VertexGenerateDash {
-#if GRAPHIC_ENABLE_DASH_GENERATE_FLAG
+#if defined(GRAPHIC_ENABLE_DASH_GENERATE_FLAG) && GRAPHIC_ENABLE_DASH_GENERATE_FLAG
     enum Status {
         INITIAL,
         READY,

interfaces/kits/gfx_utils/diagram/vertexgenerate/vertex_generate_stroke.h

@@ -47,7 +47,7 @@ class VertexGenerateStroke {
 public:
     VertexGenerateStroke();
 
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     void SetLineCap(LineCap lc)
     {
         stroker_.SetLineCap(lc);
@@ -57,7 +57,7 @@ public:
         return stroker_.GetLineCap();
     }
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     void SetLineJoin(LineJoin lj)
     {
         stroker_.SetLineJoin(lj);

interfaces/kits/gfx_utils/diagram/vertexprimitive/geometry_arc.h

@@ -28,7 +28,7 @@ namespace OHOS {
  * @version 1.0
  */
 class GeometryArc : public HeapBase {
-#if GRAPHIC_ENABLE_ARC_FLAG
+#if defined(GRAPHIC_ENABLE_ARC_FLAG) && GRAPHIC_ENABLE_ARC_FLAG
 public:
     GeometryArc() : initialized_(false), pathCommand_(0.0f), centerX_(0.0f),
                     centerY_(0.0f), radiusX_(0.0f), radiusY_(0.0f),

interfaces/kits/gfx_utils/diagram/vertexprimitive/geometry_bezier_arc.h

@@ -29,7 +29,7 @@
 #include "gfx_utils/diagram/depiction/depict_transform.h"
 #include "gfx_utils/heap_base.h"
 namespace OHOS {
-#if GRAPHIC_ENABLE_BEZIER_ARC_FLAG
+#if defined(GRAPHIC_ENABLE_BEZIER_ARC_FLAG) && GRAPHIC_ENABLE_BEZIER_ARC_FLAG
 const int32_t BEZIER_ARC_VERTEX_NUM = 26; // Number of Bezier Arc Vertex Coordinates.
 /**
  * @brief Arcs are converted to Bezier curves.

interfaces/kits/gfx_utils/diagram/vertexprimitive/geometry_math_stroke.h

@@ -60,16 +60,16 @@ public:
           strokeWidthUsingAbs_(ALPHA_HALF),
           strokeWidthPercentDivision_(ALPHA_HALF / BUF_SIZE),
           strokeWidthSignal_(1),
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
           lineCap_(BUTT_CAP),
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
           miterLimitMeasure_(DEFAULTMITERLIMIT),
           lineJoin_(MITER_JOIN),
 #endif
           approxScaleRadio_(1.0f) {}
 
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     /**
      * @brief SetLineCap Defines the end style of the line
      */
@@ -144,7 +144,7 @@ public:
     }
 #endif
 
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     /**
      * @brief SetLineJoin Defines the type of corner created when two lines intersect.
      * Pay attention to 90 degree rotation at both ends of the corner.
@@ -438,10 +438,10 @@ private:
     int32_t strokeWidthSignal_;
 
     float approxScaleRadio_;
-#if GRAPHIC_ENABLE_LINECAP_FLAG
+#if defined(GRAPHIC_ENABLE_LINECAP_FLAG) && GRAPHIC_ENABLE_LINECAP_FLAG
     LineCap lineCap_;
 #endif
-#if GRAPHIC_ENABLE_LINEJOIN_FLAG
+#if defined(GRAPHIC_ENABLE_LINEJOIN_FLAG) && GRAPHIC_ENABLE_LINEJOIN_FLAG
     LineJoin lineJoin_;
     float miterLimitMeasure_;
 #endif

interfaces/kits/gfx_utils/diagram/vertexprimitive/geometry_path_storage.h

@@ -316,7 +316,7 @@ public:
             if (CalcDistance(x0, y0, x, y) < epsilon) {
                 return;
             }
-#if GRAPHIC_ENABLE_BEZIER_ARC_FLAG
+#if defined(GRAPHIC_ENABLE_BEZIER_ARC_FLAG) && GRAPHIC_ENABLE_BEZIER_ARC_FLAG
             BezierArcSvg bezierArcSvg(x0, y0, rx, ry, angle, largeArcFlag, sweepFlag, x, y);
             if (bezierArcSvg.RadiiOK()) {
                 JoinPath(bezierArcSvg);
@@ -406,7 +406,7 @@ public:
         }
         return vertices_.GenerateVertex(iterator_++, x, y);
     }
-#if GRAPHIC_ENABLE_BEZIER_ARC_FLAG
+#if defined(GRAPHIC_ENABLE_BEZIER_ARC_FLAG) && GRAPHIC_ENABLE_BEZIER_ARC_FLAG
     /**
      * @brief Connection path.
      * @param vs Vertex source to connect.

interfaces/kits/gfx_utils/style.h

@@ -203,7 +203,7 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    StyleDefault(){}
+    StyleDefault() {}
 
     /**
      * @brief A destructor used to delete the <b>StyleDefault</b> instance.
@@ -211,7 +211,7 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    ~StyleDefault(){}
+    ~StyleDefault() {}
 
     static void Init();
 

interfaces/kits/gfx_utils/sys_info.h

@@ -85,7 +85,7 @@ public:
          * @since 1.0
          * @version 1.0
          */
-        OnFPSChangedListener() : type_(FPS_CT_FIXED_TIME){}
+        OnFPSChangedListener() : type_(FPS_CT_FIXED_TIME) {}
 
         /**
          * @brief A destructor used to delete the <b>OnFPSChangedListener</b> instance.

interfaces/kits/gfx_utils/trans_affine.h

@@ -224,7 +224,7 @@ public:
      * @since 1.0
      * @version 1.0
      */
-    static TransAffine TransAffineTranslation(float x,float y)
+    static TransAffine TransAffineTranslation(float x, float y)
     {
         return TransAffine(1.0f, 0.0f, 0.0f, 1.0f, x, y);
     }