Browse Source

Fix(win32): warning c4244

viest 5 years ago
parent
commit
c4e4adfe70
3 changed files with 29 additions and 27 deletions
  1. 10 8
      kernel/chart.c
  2. 10 10
      kernel/format.c
  3. 9 9
      kernel/write.c

+ 10 - 8
kernel/chart.c

@@ -97,8 +97,8 @@ ZEND_END_ARG_INFO()
 PHP_METHOD(vtiful_chart, __construct)
 {
     zval *handle;
-    zend_long type;
     chart_object *obj;
+    zend_long type = 0;
     xls_resource_write_t *xls_res;
 
     ZEND_PARSE_PARAMETERS_START(2, 2)
@@ -112,7 +112,7 @@ PHP_METHOD(vtiful_chart, __construct)
     obj     = Z_CHART_P(getThis());
 
     if (obj->ptr.chart == NULL) {
-        obj->ptr.chart = workbook_add_chart(xls_res->workbook, type);
+        obj->ptr.chart = workbook_add_chart(xls_res->workbook, (uint8_t)type);
     }
 }
 /* }}} */
@@ -168,7 +168,7 @@ PHP_METHOD(vtiful_chart, seriesName)
 PHP_METHOD(vtiful_chart, style)
 {
     chart_object *obj;
-    zend_long style;
+    zend_long style = 0;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
             Z_PARAM_LONG(style)
@@ -178,7 +178,7 @@ PHP_METHOD(vtiful_chart, style)
 
     obj = Z_CHART_P(getThis());
 
-    chart_set_style(obj->ptr.chart, style);
+    chart_set_style(obj->ptr.chart, (uint8_t)style);
 }
 /* }}} */
 
@@ -243,7 +243,7 @@ PHP_METHOD(vtiful_chart, title)
  */
 PHP_METHOD(vtiful_chart, legendSetPosition)
 {
-    zend_long type;
+    zend_long type = 0;
     chart_object *obj;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
@@ -254,7 +254,7 @@ PHP_METHOD(vtiful_chart, legendSetPosition)
 
     obj = Z_CHART_P(getThis());
 
-    chart_legend_set_position(obj->ptr.chart, type);
+    chart_legend_set_position(obj->ptr.chart, (uint8_t)type);
 }
 /* }}} */
 
@@ -323,10 +323,12 @@ VTIFUL_STARTUP_FUNCTION(chart)
     REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_LEFT",                   LXW_CHART_LEGEND_LEFT)
     REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_TOP",                    LXW_CHART_LEGEND_TOP)
     REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_BOTTOM",                 LXW_CHART_LEGEND_BOTTOM)
-    REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_TOP_RIGHT",              LXW_CHART_LEGEND_TOP_RIGHT)
     REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_OVERLAY_RIGHT",          LXW_CHART_LEGEND_OVERLAY_RIGHT)
     REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_OVERLAY_LEFT",           LXW_CHART_LEGEND_OVERLAY_LEFT)
-    REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_OVERLAY_TOP_RIGHT",      LXW_CHART_LEGEND_OVERLAY_TOP_RIGHT)
+
+    // PECL Windows version is 0.7.7, but define in 0.7.8
+    //REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_TOP_RIGHT",              LXW_CHART_LEGEND_TOP_RIGHT)
+    //REGISTER_CLASS_CONST_LONG(vtiful_chart_ce, "CHART_LEGEND_OVERLAY_TOP_RIGHT",      LXW_CHART_LEGEND_OVERLAY_TOP_RIGHT)
 
     return SUCCESS;
 }

+ 10 - 10
kernel/format.c

@@ -144,7 +144,7 @@ PHP_METHOD(vtiful_format, italic)
  */
 PHP_METHOD(vtiful_format, underline)
 {
-    zend_long style;
+    zend_long style = 0;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
             Z_PARAM_LONG(style)
@@ -155,7 +155,7 @@ PHP_METHOD(vtiful_format, underline)
     format_object *obj = Z_FORMAT_P(getThis());
 
     if (obj->ptr.format) {
-        format_set_underline(obj->ptr.format, style);
+        format_set_underline(obj->ptr.format, (uint8_t)style);
     }
 }
 /* }}} */
@@ -183,7 +183,7 @@ PHP_METHOD(vtiful_format, align)
         }
 
         if (obj->ptr.format) {
-            format_set_align(obj->ptr.format, Z_LVAL_P(arg));
+            format_set_align(obj->ptr.format, (uint8_t)Z_LVAL_P(arg));
         }
     }
 }
@@ -193,7 +193,7 @@ PHP_METHOD(vtiful_format, align)
  */
 PHP_METHOD(vtiful_format, fontColor)
 {
-    zend_long color;
+    zend_long color = 0;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
             Z_PARAM_LONG(color)
@@ -204,7 +204,7 @@ PHP_METHOD(vtiful_format, fontColor)
     format_object *obj = Z_FORMAT_P(getThis());
 
     if (obj->ptr.format) {
-        format_set_font_color(obj->ptr.format, color);
+        format_set_font_color(obj->ptr.format, (uint8_t)color);
     }
 }
 /* }}} */
@@ -233,7 +233,7 @@ PHP_METHOD(vtiful_format, number)
  */
 PHP_METHOD(vtiful_format, background)
 {
-    zend_long pattern, color;
+    zend_long pattern = 0, color = 0;
 
     ZEND_PARSE_PARAMETERS_START(2, 2)
             Z_PARAM_LONG(pattern)
@@ -245,8 +245,8 @@ PHP_METHOD(vtiful_format, background)
     format_object *obj = Z_FORMAT_P(getThis());
 
     if (obj->ptr.format) {
-        format_set_pattern(obj->ptr.format, pattern);
-        format_set_bg_color(obj->ptr.format, color);
+        format_set_pattern(obj->ptr.format, (uint8_t)pattern);
+        format_set_bg_color(obj->ptr.format, (uint8_t)color);
     }
 }
 /* }}} */
@@ -303,7 +303,7 @@ PHP_METHOD(vtiful_format, wrap)
  */
 PHP_METHOD(vtiful_format, border)
 {
-    zend_long style;
+    zend_long style = 0;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
             Z_PARAM_LONG(style)
@@ -314,7 +314,7 @@ PHP_METHOD(vtiful_format, border)
     format_object *obj = Z_FORMAT_P(getThis());
 
     if (obj->ptr.format) {
-        format_set_border(obj->ptr.format, style);
+        format_set_border(obj->ptr.format, (uint8_t)style);
     }
 }
 /* }}} */

+ 9 - 9
kernel/write.c

@@ -37,12 +37,12 @@ void type_writer(zval *value, zend_long row, zend_long columns, xls_resource_wri
 
             format_set_num_format(value_format, ZSTR_VAL(format));
 
-            worksheet_write_number(res->worksheet, lxw_row, lxw_col, zval_get_long(value), value_format);
+            worksheet_write_number(res->worksheet, lxw_row, lxw_col, (double)zval_get_long(value), value_format);
             return;
         }
 
         if (format == NULL && format_handle != NULL) {
-            worksheet_write_number(res->worksheet, lxw_row, lxw_col, zval_get_long(value), format_handle);
+            worksheet_write_number(res->worksheet, lxw_row, lxw_col, (double)zval_get_long(value), format_handle);
             return;
         }
 
@@ -52,11 +52,11 @@ void type_writer(zval *value, zend_long row, zend_long columns, xls_resource_wri
             format_copy(value_format, format_handle);
             format_set_num_format(value_format, ZSTR_VAL(format));
 
-            worksheet_write_number(res->worksheet, lxw_row, lxw_col, zval_get_long(value), value_format);
+            worksheet_write_number(res->worksheet, lxw_row, lxw_col, (double)zval_get_long(value), value_format);
             return;
         }
 
-        worksheet_write_number(res->worksheet, lxw_row, lxw_col, zval_get_long(value), NULL);
+        worksheet_write_number(res->worksheet, lxw_row, lxw_col, (double)zval_get_long(value), NULL);
     }
 
     if (value_type == IS_DOUBLE) {
@@ -84,7 +84,7 @@ void type_writer(zval *value, zend_long row, zend_long columns, xls_resource_wri
             return;
         }
 
-        worksheet_write_number(res->worksheet, row, columns, zval_get_double(value), NULL);
+        worksheet_write_number(res->worksheet, (lxw_row_t)row, (lxw_col_t)columns, zval_get_double(value), NULL);
         return;
     }
 }
@@ -162,7 +162,7 @@ void format_copy(lxw_format *new_format, lxw_format *other_format)
 
 void url_writer(zend_long row, zend_long columns, xls_resource_write_t *res, zend_string *url, lxw_format *format)
 {
-    worksheet_write_url(res->worksheet, row, columns, ZSTR_VAL(url), format);
+    worksheet_write_url(res->worksheet, (lxw_row_t)row, (lxw_col_t)columns, ZSTR_VAL(url), format);
 }
 
 /*
@@ -172,7 +172,7 @@ void image_writer(zval *value, zend_long row, zend_long columns, double width, d
 {
     lxw_image_options options = {.x_scale = width, .y_scale = height};
 
-    worksheet_insert_image_opt(res->worksheet, row, columns, ZSTR_VAL(zval_get_string(value)), &options);
+    worksheet_insert_image_opt(res->worksheet, (lxw_row_t)row, (lxw_col_t)columns, ZSTR_VAL(zval_get_string(value)), &options);
 }
 
 /*
@@ -180,12 +180,12 @@ void image_writer(zval *value, zend_long row, zend_long columns, double width, d
  */
 void formula_writer(zval *value, zend_long row, zend_long columns, xls_resource_write_t *res)
 {
-    worksheet_write_formula(res->worksheet, row, columns, ZSTR_VAL(zval_get_string(value)), NULL);
+    worksheet_write_formula(res->worksheet, (lxw_row_t)row, (lxw_col_t)columns, ZSTR_VAL(zval_get_string(value)), NULL);
 }
 
 void chart_writer(zend_long row, zend_long columns, xls_resource_chart_t *chart_resource, xls_resource_write_t *res)
 {
-    worksheet_insert_chart(res->worksheet, row, columns, chart_resource->chart);
+    worksheet_insert_chart(res->worksheet, (lxw_row_t)row, (lxw_col_t)columns, chart_resource->chart);
 }
 
 /*