[Bf-blender-cvs] [c91f642ba39] temp-gpencil-io: Cleanup in Import and return values

[Antonio Vazquez]

Commit: c91f642ba39628725b20d2c9df21ce1129ff8310
Author: Antonio Vazquez
Date:   Wed Mar 17 19:06:08 2021 +0100
Branches: temp-gpencil-io
https://developer.blender.org/rBc91f642ba39628725b20d2c9df21ce1129ff8310

Cleanup in Import and return values

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

M	source/blender/io/gpencil/intern/gpencil_io_capi.cc
M	source/blender/io/gpencil/intern/gpencil_io_import_svg.cc

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

diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index 6c904f172fd..a6d4949090e 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -118,8 +118,8 @@ static bool gpencil_io_export_pdf(Depsgraph *depsgraph,
 
   const bool use_frame_selected = (iparams->frame_mode == GP_EXPORT_FRAME_SELECTED);
   if (!use_frame_selected) {
-    result |= exporter->add_newpage();
-    result |= exporter->add_body();
+    exporter->add_newpage();
+    exporter->add_body();
     result = exporter->write();
   }
   else {
@@ -131,8 +131,8 @@ static bool gpencil_io_export_pdf(Depsgraph *depsgraph,
       CFRA = i;
       BKE_scene_graph_update_for_newframe(depsgraph);
       exporter->frame_number_set(i);
-      result |= exporter->add_newpage();
-      result |= exporter->add_body();
+      exporter->add_newpage();
+      exporter->add_body();
     }
     result = exporter->write();
     /* Back to original frame. */
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 61445048bf4..4c840d5fa1a 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
@@ -26,6 +26,9 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "BLI_float3.hh"
+#include "BLI_span.hh"
+
 #include "BKE_gpencil.h"
 #include "BKE_gpencil_geom.h"
 
@@ -48,6 +51,8 @@
 
 #include "nanosvg/nanosvg.h"
 
+using blender::MutableSpan;
+
 namespace blender::io::gpencil {
 
 /* Constructor. */
@@ -84,7 +89,7 @@ bool GpencilImporterSVG::read()
 
   /* Grease pencil is rotated 90 degrees in X axis by default. */
   float matrix[4][4];
-  float scale[3] = {params_.scale, params_.scale, params_.scale};
+  const float3 scale = float3(params_.scale);
   unit_m4(matrix);
   rotate_m4(matrix, 'X', DEG2RADF(-90.0f));
   rescale_m4(matrix, scale);
@@ -150,10 +155,8 @@ bool GpencilImporterSVG::read()
   LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd_->layers) {
     LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
       LISTBASE_FOREACH (bGPDstroke *, gps, &gpf->strokes) {
-        int i;
-        bGPDspoint *pt;
-        for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
-          sub_v3_v3(&pt->x, gp_center);
+        for (bGPDspoint &pt : MutableSpan(gps->points, gps->totpoints)) {
+          sub_v3_v3(&pt.x, gp_center);
         }
       }
     }