[Bf-blender-cvs] [c258b0743c9] greasepencil-object: GPencil: Cleanup variable types

[Antonio Vazquez]

Commit: c258b0743c9af0435ef71c178050f89129254b26
Author: Antonio Vazquez
Date:   Thu Aug 20 18:15:00 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc258b0743c9af0435ef71c178050f89129254b26

GPencil: Cleanup variable types

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

M	source/blender/io/gpencil/gpencil_io_exporter.h
M	source/blender/io/gpencil/intern/gpencil_io_capi.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_base.cc
M	source/blender/io/gpencil/intern/gpencil_io_export_svg.cc

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

diff --git a/source/blender/io/gpencil/gpencil_io_exporter.h b/source/blender/io/gpencil/gpencil_io_exporter.h
index 7e7c9e8ea24..c91d65e6b53 100644
--- a/source/blender/io/gpencil/gpencil_io_exporter.h
+++ b/source/blender/io/gpencil/gpencil_io_exporter.h
@@ -39,21 +39,21 @@ struct GpencilExportParams {
   /** Export mode.  */
   uint16_t mode;
   /** Start frame.  */
-  double frame_start;
+  int32_t frame_start;
   /** End frame.  */
-  double frame_end;
-  /** File subfix. */
-  char file_subfix[5];
+  int32_t frame_end;
   /* Current frame. */
   int32_t framenum;
   /** Flags. */
   uint32_t flag;
   /** Select mode */
   uint16_t select;
+  /** File subfix. */
+  char file_subfix[5];
   /** Stroke sampling. */
   float stroke_sample;
   /** Row and cols of storyboard. */
-  int page_layout[2];
+  int32_t page_layout[2];
   /** Page type (Landscape/Portrait). */
   uint16_t page_type;
   /** Paper size in pixels. */
diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index 6ad7aec3d15..a575bebb8ee 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -46,7 +46,7 @@
 using blender::io::gpencil::GpencilExporterSVG;
 
 /* Check if frame is included. */
-static bool is_keyframe_selected(bContext *C, bGPdata *gpd, int framenum, bool use_markers)
+static bool is_keyframe_selected(bContext *C, bGPdata *gpd, int32_t framenum, bool use_markers)
 {
   if (!use_markers) {
     /* Check if exist a frame. */
@@ -130,7 +130,7 @@ static bool gpencil_io_export_storyboard(Depsgraph *depsgraph,
   }
 
   /* Calc paper sizes. */
-  const int blocks[2] = {iparams->page_layout[0], iparams->page_layout[1]};
+  const int32_t blocks[2] = {iparams->page_layout[0], iparams->page_layout[1]};
   float frame_box[2];
   float render_ratio[2];
 
@@ -146,16 +146,16 @@ static bool gpencil_io_export_storyboard(Depsgraph *depsgraph,
   const float gap[2] = {frame_box[0] / ((float)blocks[0] + 1.0f), ysize};
   float frame_offset[2] = {gap[0], gap[1]};
 
-  uint8_t col = 1;
-  uint8_t row = 1;
-  uint8_t page = 1;
+  uint16_t col = 1;
+  uint16_t row = 1;
+  uint16_t page = 1;
   bool header = true;
   bool pending_save = false;
-  uint8_t shot = 0;
+  uint16_t shot = 0;
 
   const bool use_markers = ((iparams->flag & GP_EXPORT_MARKERS) != 0);
 
-  for (int i = iparams->frame_start; i < iparams->frame_end + 1; i++) {
+  for (int32_t i = iparams->frame_start; i < iparams->frame_end + 1; i++) {
     if (is_keyframe_selected(iparams->C, gpd_eval, i, use_markers)) {
       continue;
     }
@@ -238,7 +238,7 @@ bool gpencil_io_export(const char *filename, GpencilExportParams *iparams)
     done |= gpencil_io_export_frame(&exporter, iparams, no_offset, true, true, true);
   }
   else {
-    int oldframe = (int)DEG_get_ctime(depsgraph);
+    int32_t oldframe = (int32_t)DEG_get_ctime(depsgraph);
 
     done |= gpencil_io_export_storyboard(depsgraph, scene, ob, filename, iparams);
 
diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_base.cc b/source/blender/io/gpencil/intern/gpencil_io_export_base.cc
index f68bc036997..ff93cc5d7d6 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_base.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_base.cc
@@ -71,7 +71,7 @@ GpencilExporter::GpencilExporter(const struct GpencilExportParams *iparams)
   frame_ratio_[0] = frame_ratio_[1] = 1.0f;
   zero_v2(frame_offset_);
 
-  copy_v2_v2_int(params_.page_layout, iparams->page_layout);
+  copy_v2_v2_int((int *)params_.page_layout, (int *)iparams->page_layout);
   params_.page_type = iparams->page_type;
   copy_v2_v2(params_.paper_size, iparams->paper_size);
   params_.text_type = iparams->text_type;
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 6e0b88d5e99..e92fde7182d 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
@@ -394,7 +394,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 (uint16_t i = 0; i < gps->totpoints; i++) {
+  for (uint32_t i = 0; i < gps->totpoints; i++) {
     if (i > 0) {
       txt.append("L");
     }
@@ -452,7 +452,7 @@ void GpencilExporterSVG::export_stroke_to_polyline(pugi::xml_node gpl_node, cons
   }
 
   std::string txt;
-  for (uint16_t i = 0; i < gps->totpoints; i++) {
+  for (uint32_t i = 0; i < gps->totpoints; i++) {
     if (i > 0) {
       txt.append(" ");
     }