黄区代码修改合入

Signed-off-by: Nxucheng57 <xucheng57@huawei.com>

frameworks/render/render_base.h

@@ -23,7 +23,6 @@
 #ifndef GRAPHIC_LITE_RENDER_BASE_H
 #define GRAPHIC_LITE_RENDER_BASE_H
 
-#include <iostream>
 #include "gfx_utils/diagram/common/common_basics.h"
 #include "render/render_buffer.h"
 
@@ -216,7 +215,9 @@ public:
     void BlendHLine(int32_t x1, int32_t y, int32_t x2, const ColorType& color, uint8_t cover)
     {
         if (x1 > x2) {
-            std::swap(x1, x2);
+            int32_t swapTemp = x1;
+            x1 = x2;
+            x2 = swapTemp;
         }
         if (y > GetYMax() || y < GetYMin() || x1 > GetXMax() || x2 < GetXMin()) {
             return;

test/uitest/test_vector_font/ui_test_vector_font.cpp

@@ -15,8 +15,6 @@
 
 #include "ui_test_vector_font.h"
 #if ENABLE_VECTOR_FONT
-#include <iostream>
-
 #include "common/screen.h"
 #include "components/ui_label.h"
 #if ENABLE_MULTI_FONT