[Bf-blender-cvs] [5ce2a7f58a3] greasepencil-object: GPencil: Fix compiler warnings

[Antonio Vazquez]

Commit: 5ce2a7f58a300f379e554db134d6e037d5f9dff0
Author: Antonio Vazquez
Date:   Tue Sep 15 16:43:49 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5ce2a7f58a300f379e554db134d6e037d5f9dff0

GPencil: Fix compiler warnings

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

M	source/blender/editors/io/io_gpencil.c
M	source/blender/io/gpencil/gpencil_io_exporter.h

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

diff --git a/source/blender/editors/io/io_gpencil.c b/source/blender/editors/io/io_gpencil.c
index 7e8bbf674b4..ed4c1d6de77 100644
--- a/source/blender/editors/io/io_gpencil.c
+++ b/source/blender/editors/io/io_gpencil.c
@@ -410,12 +410,12 @@ static int wm_gpencil_export_stb_exec(bContext *C, wmOperator *op)
 
   float paper_size[2];
   if (RNA_enum_get(op->ptr, "page_type") == GP_EXPORT_PAPER_LANDSCAPE) {
-    paper_size[0] = gpencil_export_paper_sizes[0][0];
-    paper_size[1] = gpencil_export_paper_sizes[0][1];
+    paper_size[0] = gpencil_export_paper_sizes[0];
+    paper_size[1] = gpencil_export_paper_sizes[1];
   }
   else {
-    paper_size[0] = gpencil_export_paper_sizes[0][1];
-    paper_size[1] = gpencil_export_paper_sizes[0][0];
+    paper_size[0] = gpencil_export_paper_sizes[1];
+    paper_size[1] = gpencil_export_paper_sizes[0];
   }
 
   const int page_layout[2] = {RNA_int_get(op->ptr, "size_col"), RNA_int_get(op->ptr, "size_row")};
diff --git a/source/blender/io/gpencil/gpencil_io_exporter.h b/source/blender/io/gpencil/gpencil_io_exporter.h
index dcb7a03ebd5..40d03cd737b 100644
--- a/source/blender/io/gpencil/gpencil_io_exporter.h
+++ b/source/blender/io/gpencil/gpencil_io_exporter.h
@@ -31,7 +31,7 @@ struct bContext;
 struct View3D;
 
 /* Paper Size: A4, Letter. */
-static const float gpencil_export_paper_sizes[1][2] = {3508, 2480};
+static const float gpencil_export_paper_sizes[2] = {3508, 2480};
 
 struct GpencilExportParams {
   bContext *C;
@@ -52,7 +52,7 @@ struct GpencilExportParams {
   /** Select mode */
   uint16_t select;
   /** File subfix. */
-  char file_subfix[5];
+  char file_subfix[10];
   /** Stroke sampling. */
   float stroke_sample;
   /** Row and cols of storyboard. */