libxlsxwriter/include/xlsxwriter/drawing.h in fast_excel-0.4.1 vs libxlsxwriter/include/xlsxwriter/drawing.h in fast_excel-0.5.0
- old
+ new
@@ -1,17 +1,18 @@
/*
* libxlsxwriter
*
- * Copyright 2014-2019, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
+ * Copyright 2014-2022, John McNamara, jmcnamara@cpan.org. See LICENSE.txt.
*
* drawing - A libxlsxwriter library for creating Excel XLSX drawing files.
*
*/
#ifndef __LXW_DRAWING_H__
#define __LXW_DRAWING_H__
#include <stdint.h>
+#include <string.h>
#include "common.h"
STAILQ_HEAD(lxw_drawing_objects, lxw_drawing_object);
@@ -20,28 +21,16 @@
LXW_DRAWING_IMAGE,
LXW_DRAWING_CHART,
LXW_DRAWING_SHAPE
};
-enum lxw_anchor_types {
- LXW_ANCHOR_TYPE_NONE = 0,
- LXW_ANCHOR_TYPE_IMAGE,
- LXW_ANCHOR_TYPE_CHART
-};
-
-enum lxw_anchor_edit_types {
- LXW_ANCHOR_EDIT_AS_NONE = 0,
- LXW_ANCHOR_EDIT_AS_RELATIVE,
- LXW_ANCHOR_EDIT_AS_ONE_CELL,
- LXW_ANCHOR_EDIT_AS_ABSOLUTE
-};
-
enum image_types {
LXW_IMAGE_UNKNOWN = 0,
LXW_IMAGE_PNG,
LXW_IMAGE_JPEG,
- LXW_IMAGE_BMP
+ LXW_IMAGE_BMP,
+ LXW_IMAGE_GIF
};
/* Coordinates used in a drawing object. */
typedef struct lxw_drawing_coords {
uint32_t col;
@@ -50,21 +39,23 @@
double row_offset;
} lxw_drawing_coords;
/* Object to represent the properties of a drawing. */
typedef struct lxw_drawing_object {
- uint8_t anchor_type;
- uint8_t edit_as;
+ uint8_t type;
+ uint8_t anchor;
struct lxw_drawing_coords from;
struct lxw_drawing_coords to;
- uint32_t col_absolute;
- uint32_t row_absolute;
+ uint64_t col_absolute;
+ uint64_t row_absolute;
uint32_t width;
uint32_t height;
uint8_t shape;
+ uint32_t rel_index;
+ uint32_t url_rel_index;
char *description;
- char *url;
char *tip;
+ uint8_t decorative;
STAILQ_ENTRY (lxw_drawing_object) list_pointers;
} lxw_drawing_object;