[Bf-blender-cvs] [1e448183a1c] greasepencil-object: GPencil: Replace uint32 with int32

[Antonio Vazquez]

Commit: 1e448183a1c7c8b53b3603cbec40bca017f021b2
Author: Antonio Vazquez
Date:   Sat Dec 12 12:52:40 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1e448183a1c7c8b53b3603cbec40bca017f021b2

GPencil: Replace uint32 with int32

According to style, negative must be checked with asserts.

===================================================================

M	source/blender/io/gpencil/gpencil_io.h
M	source/blender/io/gpencil/intern/gpencil_io_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
M	source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
M	source/blender/io/gpencil/intern/gpencil_io_import_svg.h

===================================================================

diff --git a/source/blender/io/gpencil/gpencil_io.h b/source/blender/io/gpencil/gpencil_io.h
index 17b44472573..e8426995d9c 100644
--- a/source/blender/io/gpencil/gpencil_io.h
+++ b/source/blender/io/gpencil/gpencil_io.h
@@ -46,7 +46,7 @@ struct GpencilIOParams {
   /* Current frame. */
   int32_t frame_cur;
   /** Flags. */
-  uint32_t flag;
+  int32_t flag;
   /** Scale. */
   float scale;
   /** Select mode. */
diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc
index 4f6a75019d5..090fc696e06 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc
@@ -245,7 +245,7 @@ float GpencilIO::stroke_average_pressure_get(struct bGPDstroke *gps)
   }
 
   float tot = 0.0f;
-  for (uint32_t i = 0; i < gps->totpoints; i++) {
+  for (int32_t i = 0; i < gps->totpoints; i++) {
     pt = &gps->points[i];
     tot += pt->pressure;
   }
@@ -267,7 +267,7 @@ bool GpencilIO::is_stroke_thickness_constant(struct bGPDstroke *gps)
   bGPDspoint *pt = &gps->points[0];
   float prv_pressure = pt->pressure;
 
-  for (uint32_t i = 0; i < gps->totpoints; i++) {
+  for (int32_t i = 0; i < gps->totpoints; i++) {
     pt = &gps->points[i];
     if (pt->pressure != prv_pressure) {
       return false;
@@ -397,7 +397,7 @@ void GpencilIO::gps_current_set(struct Object *ob, struct bGPDstroke *gps, const
     avg_opacity_ = 0;
     /* Get average vertex color and apply. */
     float avg_color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-    for (uint32_t i = 0; i < gps->totpoints; i++) {
+    for (int32_t i = 0; i < gps->totpoints; i++) {
       bGPDspoint *pt = &gps->points[i];
       add_v4_v4(avg_color, pt->vert_color);
       avg_opacity_ += pt->strength;
@@ -444,7 +444,7 @@ void GpencilIO::selected_objects_boundbox_set(void)
 {
   const float gap = 10.0f;
   const bGPDspoint *pt;
-  uint32_t i;
+  int32_t i;
 
   float screen_co[2];
   float r_min[2], r_max[2];
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
index e2003e8db94..68ca511d346 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
@@ -287,7 +287,7 @@ void GpencilExporterPDF::export_stroke_to_polyline(const bool do_fill, const boo
   }
 
   /* Loop all points. */
-  for (uint32_t i = 0; i < gps->totpoints; i++) {
+  for (int32_t i = 0; i < gps->totpoints; i++) {
     pt = &gps->points[i];
     float screen_co[2];
     HPDF_STATUS err;
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
index 52daeaa5e12..31f4bf1e033 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -323,7 +323,7 @@ void GpencilExporterSVG::export_stroke_to_path(pugi::xml_node gpl_node, const bo
   gps_node.append_attribute("stroke").set_value("none");
 
   std::string txt = "M";
-  for (uint32_t i = 0; i < gps->totpoints; i++) {
+  for (int32_t i = 0; i < gps->totpoints; i++) {
     if (i > 0) {
       txt.append("L");
     }
@@ -381,7 +381,7 @@ void GpencilExporterSVG::export_stroke_to_polyline(pugi::xml_node gpl_node, cons
   }
 
   std::string txt;
-  for (uint32_t i = 0; i < gps->totpoints; i++) {
+  for (int32_t i = 0; i < gps->totpoints; i++) {
     if (i > 0) {
       txt.append(" ");
     }
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
index 451642a7907..308c0b1b8a2 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
@@ -252,7 +252,7 @@ static void unpack_nano_color(const unsigned int pack, float r_col[4])
   r_col[3] = (float)rgb_u[3] / 255.0f;
 }
 
-void GpencilImporterSVG::convert_color(const uint32_t color, float r_linear_rgba[4])
+void GpencilImporterSVG::convert_color(const int32_t color, float r_linear_rgba[4])
 {
   float rgba[4];
   unpack_nano_color(color, rgba);
diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.h b/source/blender/io/gpencil/intern/gpencil_io_import_svg.h
index e624f7490f6..d2c40d67ccf 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.h
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.h
@@ -51,7 +51,7 @@ class GpencilImporterSVG : public GpencilImporter {
                      const int32_t mat_index,
                      const float matrix[4][4]);
 
-  void convert_color(const uint32_t color, float r_linear_rgba[4]);
+  void convert_color(const int32_t color, float r_linear_rgba[4]);
 };
 
 }  // namespace blender::io::gpencil