chartsheet.c in fast_excel-0.5.0

- old
+ new

@@ -1,11 +1,11 @@
 /*****************************************************************************
  * chartsheet - A library for creating Excel XLSX chartsheet files.
  *
  * Used in conjunction with the libxlsxwriter library.
  *
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
  *
  */
 
 #include "xlsxwriter/xmlwriter.h"
 #include "xlsxwriter/chartsheet.h"
@@ -64,12 +64,12 @@
 {
     if (!chartsheet)
         return;
 
     lxw_worksheet_free(chartsheet->worksheet);
-    free(chartsheet->name);
-    free(chartsheet->quoted_name);
+    free((void *) chartsheet->name);
+    free((void *) chartsheet->quoted_name);
     free(chartsheet);
 }
 
 /*****************************************************************************
  *
@@ -223,13 +223,13 @@
 /*
  * Set a chartsheet chart, with options.
  */
 lxw_error
 chartsheet_set_chart_opt(lxw_chartsheet *self,
-                         lxw_chart *chart, lxw_image_options *user_options)
+                         lxw_chart *chart, lxw_chart_options *user_options)
 {
-    lxw_image_options *options;
+    lxw_object_properties *object_props;
     lxw_chart_series *series;
 
     if (!chart) {
         LXW_WARN("chartsheet_set_chart()/_opt(): chart must be non-NULL.");
         return LXW_ERROR_NULL_PARAMETER_IGNORED;
@@ -258,36 +258,36 @@
 
             return LXW_ERROR_PARAMETER_VALIDATION;
         }
     }
 
-    /* Create a new object to hold the chart image options. */
-    options = calloc(1, sizeof(lxw_image_options));
-    RETURN_ON_MEM_ERROR(options, LXW_ERROR_MEMORY_MALLOC_FAILED);
+    /* Create a new object to hold the chart image properties. */
+    object_props = calloc(1, sizeof(lxw_object_properties));
+    RETURN_ON_MEM_ERROR(object_props, LXW_ERROR_MEMORY_MALLOC_FAILED);
 
     if (user_options) {
-        options->x_offset = user_options->x_offset;
-        options->y_offset = user_options->y_offset;
-        options->x_scale = user_options->x_scale;
-        options->y_scale = user_options->y_scale;
+        object_props->x_offset = user_options->x_offset;
+        object_props->y_offset = user_options->y_offset;
+        object_props->x_scale = user_options->x_scale;
+        object_props->y_scale = user_options->y_scale;
     }
 
-    /* TODO. Read defaults from chart. */
-    options->width = 480;
-    options->height = 288;
+    object_props->width = 480;
+    object_props->height = 288;
 
-    if (!options->x_scale)
-        options->x_scale = 1;
+    if (object_props->x_scale == 0.0)
+        object_props->x_scale = 1;
 
-    if (!options->y_scale)
-        options->y_scale = 1;
+    if (object_props->y_scale == 0.0)
+        object_props->y_scale = 1;
 
     /* Store chart references so they can be ordered in the workbook. */
-    options->chart = chart;
+    object_props->chart = chart;
 
     /* Store the chart data in the embedded worksheet. */
-    STAILQ_INSERT_TAIL(self->worksheet->chart_data, options, list_pointers);
+    STAILQ_INSERT_TAIL(self->worksheet->chart_data, object_props,
+                       list_pointers);
 
     chart->in_use = LXW_TRUE;
     chart->is_chartsheet = LXW_TRUE;
 
     chart->is_protected = self->is_protected;
@@ -383,10 +383,10 @@
  */
 void
 chartsheet_protect(lxw_chartsheet *self, const char *password,
                    lxw_protection *options)
 {
-    struct lxw_protection *protect = &self->protection;
+    struct lxw_protection_obj *protect = &self->protection;
 
     /* Copy any user parameters to the internal structure. */
     if (options) {
         protect->objects = options->no_objects;
         protect->no_content = options->no_content;