c/libxlsxwriter
1
0
Fork 0
mirror of https://github.com/jmcnamara/libxlsxwriter synced 2025-03-28 21:13:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored the insert image and chart APIs.

Browse Source 
See #252
This commit is contained in:
John McNamara 2019-11-11 20:53:15 +00:00
parent 695fc684b0
commit 035a3c6fdf
9 changed files with 249 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.indent.pro vendored
View File

@ -71,6 +71,7 @@
-T lxw_chart_line_dash_type
-T lxw_chart_marker
-T lxw_chart_marker_type
-T lxw_chart_options
-T lxw_chart_pattern
-T lxw_chart_pattern_type
-T lxw_chart_point
@ -104,6 +105,7 @@
-T lxw_heading_pair
-T lxw_image_options
-T lxw_merged_range
-T lxw_object_properties
-T lxw_packager
-T lxw_panes
-T lxw_part_name

2
include/xlsxwriter/chartsheet.h
View File

@ -143,7 +143,7 @@ lxw_error chartsheet_set_chart(lxw_chartsheet *chartsheet, lxw_chart *chart);
/* Not currently required since scale options aren't useful in a chartsheet. */
lxw_error chartsheet_set_chart_opt(lxw_chartsheet *chartsheet,
lxw_chart *chart,
lxw_image_options *user_options);
lxw_chart_options *user_options);
/**
* @brief Make a chartsheet the active, i.e., visible chartsheet.

77
include/xlsxwriter/worksheet.h
View File

@ -260,8 +260,8 @@ struct lxw_table_rows {
STAILQ_HEAD(lxw_merged_ranges, lxw_merged_range);
STAILQ_HEAD(lxw_selections, lxw_selection);
STAILQ_HEAD(lxw_data_validations, lxw_data_validation);
STAILQ_HEAD(lxw_image_data, lxw_image_options);
STAILQ_HEAD(lxw_chart_data, lxw_image_options);
STAILQ_HEAD(lxw_image_props, lxw_object_properties);
STAILQ_HEAD(lxw_chart_props, lxw_object_properties);
/**
* @brief Options for rows and columns.
@ -526,7 +526,7 @@ typedef struct lxw_data_validation {
} lxw_data_validation;
/**
* @brief Options for inserted images
* @brief Options for inserted images.
*
* Options for modifying images inserted via `worksheet_insert_image_opt()`.
*
@ -545,15 +545,58 @@ typedef struct lxw_image_options {
/** Y scale of the image as a decimal. */
double y_scale;
/** Object position - not implemented yet. Set to 0.*/
uint8_t object_position;
/** Optional description of the image. Defaults to the image filename
* as in Excel. Set to "" to ignore the description field. */
char *description;
/** Image hyperlink - not implemented yet. Set to NULL.*/
char *url;
/** Image hyperlink tip - not implemented yet. Set to NULL. */
char *tip;
} lxw_image_options;
/**
* @brief Options for inserted charts.
*
* Options for modifying charts inserted via `worksheet_insert_chart_opt()`.
*
*/
typedef struct lxw_chart_options {
/** Offset from the left of the cell in pixels. */
int32_t x_offset;
/** Offset from the top of the cell in pixels. */
int32_t y_offset;
/** X scale of the chart as a decimal. */
double x_scale;
/** Y scale of the chart as a decimal. */
double y_scale;
/** Object position - not implemented yet. Set to 0. */
uint8_t object_position;
} lxw_chart_options;
typedef struct lxw_object_properties {
int32_t x_offset;
int32_t y_offset;
double x_scale;
double y_scale;
lxw_row_t row;
lxw_col_t col;
char *filename;
char *description;
char *url;
char *tip;
uint8_t anchor;
/* Internal metadata. */
uint8_t object_position;
FILE *stream;
uint8_t image_type;
uint8_t is_image_buffer;
@ -566,9 +609,8 @@ typedef struct lxw_image_options {
double y_dpi;
lxw_chart *chart;
STAILQ_ENTRY (lxw_image_options) list_pointers;
} lxw_image_options;
STAILQ_ENTRY (lxw_object_properties) list_pointers;
} lxw_object_properties;
/**
* @brief Header and footer options.
@ -678,8 +720,8 @@ typedef struct lxw_worksheet {
struct lxw_merged_ranges *merged_ranges;
struct lxw_selections *selections;
struct lxw_data_validations *data_validations;
struct lxw_image_data *image_data;
struct lxw_chart_data *chart_data;
struct lxw_image_props *image_props;
struct lxw_chart_props *chart_data;
lxw_row_t dim_rowmin;
lxw_row_t dim_rowmax;
@ -1871,10 +1913,10 @@ lxw_error worksheet_insert_chart(lxw_worksheet *worksheet,
*
* The `%worksheet_insert_chart_opt()` function is like
* `worksheet_insert_chart()` function except that it takes an optional
* #lxw_image_options struct to scale and position the image of the chart:
* #lxw_chart_options struct to scale and position the chart:
*
* @code
* lxw_image_options options = {.x_offset = 30, .y_offset = 10,
* lxw_chart_options options = {.x_offset = 30, .y_offset = 10,
* .x_scale = 0.5, .y_scale = 0.75};
*
* worksheet_insert_chart_opt(worksheet, 0, 2, chart, &options);
@ -1883,14 +1925,11 @@ lxw_error worksheet_insert_chart(lxw_worksheet *worksheet,
*
* @image html chart_line_opt.png
*
* The #lxw_image_options struct is the same struct used in
* `worksheet_insert_image_opt()` to position and scale images.
*
*/
lxw_error worksheet_insert_chart_opt(lxw_worksheet *worksheet,
lxw_row_t row, lxw_col_t col,
lxw_chart *chart,
lxw_image_options *user_options);
lxw_chart_options *user_options);
/**
* @brief Merge a range of cells.
@ -3268,11 +3307,11 @@ void lxw_worksheet_write_single_row(lxw_worksheet *worksheet);
void lxw_worksheet_prepare_image(lxw_worksheet *worksheet,
uint32_t image_ref_id, uint32_t drawing_id,
lxw_image_options *image_data);
lxw_object_properties *object_props);
void lxw_worksheet_prepare_chart(lxw_worksheet *worksheet,
uint32_t chart_ref_id, uint32_t drawing_id,
lxw_image_options *image_data,
lxw_object_properties *object_props,
uint8_t is_chartsheet);
lxw_row *lxw_worksheet_find_row(lxw_worksheet *worksheet, lxw_row_t row_num);

35
src/chartsheet.c
View File

@ -225,9 +225,9 @@ lxw_chartsheet_assemble_xml_file(lxw_chartsheet *self)
*/
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) {
@ -260,32 +260,33 @@ chartsheet_set_chart_opt(lxw_chartsheet *self,
}
}
/* 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)
object_props->x_scale = 1;
if (!options->y_scale)
options->y_scale = 1;
if (!object_props->y_scale)
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;

20
src/packager.c
View File

@ -247,7 +247,7 @@ _write_image_files(lxw_packager *self)
lxw_workbook *workbook = self->workbook;
lxw_sheet *sheet;
lxw_worksheet *worksheet;
lxw_image_options *image;
lxw_object_properties *object_props;
lxw_error err;
FILE *image_stream;
@ -260,21 +260,22 @@ _write_image_files(lxw_packager *self)
else
worksheet = sheet->u.worksheet;
if (STAILQ_EMPTY(worksheet->image_data))
if (STAILQ_EMPTY(worksheet->image_props))
continue;
STAILQ_FOREACH(image, worksheet->image_data, list_pointers) {
STAILQ_FOREACH(object_props, worksheet->image_props, list_pointers) {
lxw_snprintf(filename, LXW_FILENAME_LENGTH,
"xl/media/image%d.%s", index++, image->extension);
"xl/media/image%d.%s", index++,
object_props->extension);
if (!image->is_image_buffer) {
if (!object_props->is_image_buffer) {
/* Check that the image file exists and can be opened. */
image_stream = lxw_fopen(image->filename, "rb");
image_stream = lxw_fopen(object_props->filename, "rb");
if (!image_stream) {
LXW_WARN_FORMAT1("Error adding image to xlsx file: file "
"doesn't exist or can't be opened: %s.",
image->filename);
object_props->filename);
return LXW_ERROR_CREATING_TMPFILE;
}
@ -283,8 +284,9 @@ _write_image_files(lxw_packager *self)
}
else {
err = _add_buffer_to_zip(self,
image->image_buffer,
image->image_buffer_size, filename);
object_props->image_buffer,
object_props->image_buffer_size,
filename);
}
RETURN_ON_ERROR(err);

22
src/workbook.c
View File

@ -886,7 +886,7 @@ _prepare_drawings(lxw_workbook *self)
{
lxw_sheet *sheet;
lxw_worksheet *worksheet;
lxw_image_options *image_options;
lxw_object_properties *object_props;
uint32_t chart_ref_id = 0;
uint32_t image_ref_id = 0;
uint32_t drawing_id = 0;
@ -902,36 +902,36 @@ _prepare_drawings(lxw_workbook *self)
is_chartsheet = LXW_FALSE;
}
if (STAILQ_EMPTY(worksheet->image_data)
if (STAILQ_EMPTY(worksheet->image_props)
&& STAILQ_EMPTY(worksheet->chart_data))
continue;
drawing_id++;
STAILQ_FOREACH(image_options, worksheet->chart_data, list_pointers) {
STAILQ_FOREACH(object_props, worksheet->chart_data, list_pointers) {
chart_ref_id++;
lxw_worksheet_prepare_chart(worksheet, chart_ref_id, drawing_id,
image_options, is_chartsheet);
if (image_options->chart)
STAILQ_INSERT_TAIL(self->ordered_charts, image_options->chart,
object_props, is_chartsheet);
if (object_props->chart)
STAILQ_INSERT_TAIL(self->ordered_charts, object_props->chart,
ordered_list_pointers);
}
STAILQ_FOREACH(image_options, worksheet->image_data, list_pointers) {
STAILQ_FOREACH(object_props, worksheet->image_props, list_pointers) {
if (image_options->image_type == LXW_IMAGE_PNG)
if (object_props->image_type == LXW_IMAGE_PNG)
self->has_png = LXW_TRUE;
if (image_options->image_type == LXW_IMAGE_JPEG)
if (object_props->image_type == LXW_IMAGE_JPEG)
self->has_jpeg = LXW_TRUE;
if (image_options->image_type == LXW_IMAGE_BMP)
if (object_props->image_type == LXW_IMAGE_BMP)
self->has_bmp = LXW_TRUE;
image_ref_id++;
lxw_worksheet_prepare_image(worksheet, image_ref_id, drawing_id,
image_options);
object_props);
}
}

292
src/worksheet.c
View File

@ -111,11 +111,11 @@ lxw_worksheet_new(lxw_worksheet_init_data *init_data)
GOTO_LABEL_ON_MEM_ERROR(worksheet->merged_ranges, mem_error);
STAILQ_INIT(worksheet->merged_ranges);
worksheet->image_data = calloc(1, sizeof(struct lxw_image_data));
GOTO_LABEL_ON_MEM_ERROR(worksheet->image_data, mem_error);
STAILQ_INIT(worksheet->image_data);
worksheet->image_props = calloc(1, sizeof(struct lxw_image_props));
GOTO_LABEL_ON_MEM_ERROR(worksheet->image_props, mem_error);
STAILQ_INIT(worksheet->image_props);
worksheet->chart_data = calloc(1, sizeof(struct lxw_chart_data));
worksheet->chart_data = calloc(1, sizeof(struct lxw_chart_props));
GOTO_LABEL_ON_MEM_ERROR(worksheet->chart_data, mem_error);
STAILQ_INIT(worksheet->chart_data);
@ -263,18 +263,18 @@ _free_row(lxw_row *row)
* Free a worksheet image_options.
*/
STATIC void
_free_image_options(lxw_image_options *image)
_free_object_properties(lxw_object_properties *object_property)
{
if (!image)
if (!object_property)
return;
free(image->filename);
free(image->description);
free(image->extension);
free(image->url);
free(image->tip);
free(image->image_buffer);
free(image);
free(object_property->filename);
free(object_property->description);
free(object_property->extension);
free(object_property->url);
free(object_property->tip);
free(object_property->image_buffer);
free(object_property);
}
/*
@ -307,7 +307,7 @@ lxw_worksheet_free(lxw_worksheet *worksheet)
lxw_row *next_row;
lxw_col_t col;
lxw_merged_range *merged_range;
lxw_image_options *image_options;
lxw_object_properties *object_props;
lxw_selection *selection;
lxw_data_validation *data_validation;
lxw_rel_tuple *relationship;
@ -360,21 +360,21 @@ lxw_worksheet_free(lxw_worksheet *worksheet)
free(worksheet->merged_ranges);
}
if (worksheet->image_data) {
while (!STAILQ_EMPTY(worksheet->image_data)) {
image_options = STAILQ_FIRST(worksheet->image_data);
STAILQ_REMOVE_HEAD(worksheet->image_data, list_pointers);
_free_image_options(image_options);
if (worksheet->image_props) {
while (!STAILQ_EMPTY(worksheet->image_props)) {
object_props = STAILQ_FIRST(worksheet->image_props);
STAILQ_REMOVE_HEAD(worksheet->image_props, list_pointers);
_free_object_properties(object_props);
}
free(worksheet->image_data);
free(worksheet->image_props);
}
if (worksheet->chart_data) {
while (!STAILQ_EMPTY(worksheet->chart_data)) {
image_options = STAILQ_FIRST(worksheet->chart_data);
object_props = STAILQ_FIRST(worksheet->chart_data);
STAILQ_REMOVE_HEAD(worksheet->chart_data, list_pointers);
_free_image_options(image_options);
_free_object_properties(object_props);
}
free(worksheet->chart_data);
@ -1834,7 +1834,7 @@ _worksheet_size_row(lxw_worksheet *self, lxw_row_t row_num)
*/
STATIC void
_worksheet_position_object_pixels(lxw_worksheet *self,
lxw_image_options *image,
lxw_object_properties *object_props,
lxw_drawing_object *drawing_object)
{
lxw_col_t col_start; /* Column containing upper left corner. */
@ -1857,12 +1857,12 @@ _worksheet_position_object_pixels(lxw_worksheet *self,
uint32_t i;
col_start = image->col;
row_start = image->row;
x1 = image->x_offset;
y1 = image->y_offset;
width = image->width;
height = image->height;
col_start = object_props->col;
row_start = object_props->row;
x1 = object_props->x_offset;
y1 = object_props->y_offset;
width = object_props->width;
height = object_props->height;
/* Adjust start column for negative offsets. */
while (x1 < 0 && col_start > 0) {
@ -1972,7 +1972,7 @@ _worksheet_position_object_pixels(lxw_worksheet *self,
*/
STATIC void
_worksheet_position_object_emus(lxw_worksheet *self,
lxw_image_options *image,
lxw_object_properties *image,
lxw_drawing_object *drawing_object)
{
@ -1995,7 +1995,7 @@ _worksheet_position_object_emus(lxw_worksheet *self,
void
lxw_worksheet_prepare_image(lxw_worksheet *self,
uint32_t image_ref_id, uint32_t drawing_id,
lxw_image_options *image_data)
lxw_object_properties *object_props)
{
lxw_drawing_object *drawing_object;
lxw_rel_tuple *relationship;
@ -2029,21 +2029,21 @@ lxw_worksheet_prepare_image(lxw_worksheet *self,
drawing_object->anchor_type = LXW_ANCHOR_TYPE_IMAGE;
drawing_object->edit_as = LXW_ANCHOR_EDIT_AS_ONE_CELL;
drawing_object->description = lxw_strdup(image_data->description);
drawing_object->description = lxw_strdup(object_props->description);
/* Scale to user scale. */
width = image_data->width * image_data->x_scale;
height = image_data->height * image_data->y_scale;
width = object_props->width * object_props->x_scale;
height = object_props->height * object_props->y_scale;
/* Scale by non 96dpi resolutions. */
width *= 96.0 / image_data->x_dpi;
height *= 96.0 / image_data->y_dpi;
width *= 96.0 / object_props->x_dpi;
height *= 96.0 / object_props->y_dpi;
/* Convert to the nearest pixel. */
image_data->width = width;
image_data->height = height;
object_props->width = width;
object_props->height = height;
_worksheet_position_object_emus(self, image_data, drawing_object);
_worksheet_position_object_emus(self, object_props, drawing_object);
/* Convert from pixels to emus. */
drawing_object->width = (uint32_t) (0.5 + width * 9525);
@ -2058,7 +2058,7 @@ lxw_worksheet_prepare_image(lxw_worksheet *self,
GOTO_LABEL_ON_MEM_ERROR(relationship->type, mem_error);
lxw_snprintf(filename, 32, "../media/image%d.%s", image_ref_id,
image_data->extension);
object_props->extension);
relationship->target = lxw_strdup(filename);
GOTO_LABEL_ON_MEM_ERROR(relationship->target, mem_error);
@ -2083,7 +2083,7 @@ void
lxw_worksheet_prepare_chart(lxw_worksheet *self,
uint32_t chart_ref_id,
uint32_t drawing_id,
lxw_image_options *image_data,
lxw_object_properties *object_props,
uint8_t is_chartsheet)
{
lxw_drawing_object *drawing_object;
@ -2128,14 +2128,14 @@ lxw_worksheet_prepare_chart(lxw_worksheet *self,
drawing_object->description = lxw_strdup("TODO_DESC");
/* Scale to user scale. */
width = image_data->width * image_data->x_scale;
height = image_data->height * image_data->y_scale;
width = object_props->width * object_props->x_scale;
height = object_props->height * object_props->y_scale;
/* Convert to the nearest pixel. */
image_data->width = width;
image_data->height = height;
object_props->width = width;
object_props->height = height;
_worksheet_position_object_emus(self, image_data, drawing_object);
_worksheet_position_object_emus(self, object_props, drawing_object);
/* Convert from pixels to emus. */
drawing_object->width = (uint32_t) (0.5 + width * 9525);
@ -2171,7 +2171,7 @@ mem_error:
* Extract width and height information from a PNG file.
*/
STATIC lxw_error
_process_png(lxw_image_options *image_options)
_process_png(lxw_object_properties *object_props)
{
uint32_t length;
uint32_t offset;
@ -2182,7 +2182,7 @@ _process_png(lxw_image_options *image_options)
double y_dpi = 96;
int fseek_err;
FILE *stream = image_options->stream;
FILE *stream = object_props->stream;
/* Skip another 4 bytes to the end of the PNG header. */
fseek_err = fseek(stream, 4, SEEK_CUR);
@ -2259,18 +2259,18 @@ _process_png(lxw_image_options *image_options)
goto file_error;
/* Set the image metadata. */
image_options->image_type = LXW_IMAGE_PNG;
image_options->width = width;
image_options->height = height;
image_options->x_dpi = x_dpi ? x_dpi : 96;
image_options->y_dpi = y_dpi ? x_dpi : 96;
image_options->extension = lxw_strdup("png");
object_props->image_type = LXW_IMAGE_PNG;
object_props->width = width;
object_props->height = height;
object_props->x_dpi = x_dpi ? x_dpi : 96;
object_props->y_dpi = y_dpi ? x_dpi : 96;
object_props->extension = lxw_strdup("png");
return LXW_NO_ERROR;
file_error:
LXW_WARN_FORMAT1("worksheet_insert_image()/_opt(): "
"no size data found in: %s.", image_options->filename);
"no size data found in: %s.", object_props->filename);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
@ -2279,7 +2279,7 @@ file_error:
* Extract width and height information from a JPEG file.
*/
STATIC lxw_error
_process_jpeg(lxw_image_options *image_options)
_process_jpeg(lxw_object_properties *image_props)
{
uint16_t length;
uint16_t marker;
@ -2290,7 +2290,7 @@ _process_jpeg(lxw_image_options *image_options)
double y_dpi = 96;
int fseek_err;
FILE *stream = image_options->stream;
FILE *stream = image_props->stream;
/* Read back 2 bytes to the end of the initial 0xFFD8 marker. */
fseek_err = fseek(stream, -2, SEEK_CUR);
@ -2385,18 +2385,18 @@ _process_jpeg(lxw_image_options *image_options)
goto file_error;
/* Set the image metadata. */
image_options->image_type = LXW_IMAGE_JPEG;
image_options->width = width;
image_options->height = height;
image_options->x_dpi = x_dpi ? x_dpi : 96;
image_options->y_dpi = y_dpi ? x_dpi : 96;
image_options->extension = lxw_strdup("jpeg");
image_props->image_type = LXW_IMAGE_JPEG;
image_props->width = width;
image_props->height = height;
image_props->x_dpi = x_dpi ? x_dpi : 96;
image_props->y_dpi = y_dpi ? x_dpi : 96;
image_props->extension = lxw_strdup("jpeg");
return LXW_NO_ERROR;
file_error:
LXW_WARN_FORMAT1("worksheet_insert_image()/_opt(): "
"no size data found in: %s.", image_options->filename);
"no size data found in: %s.", image_props->filename);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
@ -2405,7 +2405,7 @@ file_error:
* Extract width and height information from a BMP file.
*/
STATIC lxw_error
_process_bmp(lxw_image_options *image_options)
_process_bmp(lxw_object_properties *image_props)
{
uint32_t width = 0;
uint32_t height = 0;
@ -2413,7 +2413,7 @@ _process_bmp(lxw_image_options *image_options)
double y_dpi = 96;
int fseek_err;
FILE *stream = image_options->stream;
FILE *stream = image_props->stream;
/* Skip another 14 bytes to the start of the BMP height/width. */
fseek_err = fseek(stream, 14, SEEK_CUR);
@ -2434,18 +2434,18 @@ _process_bmp(lxw_image_options *image_options)
width = LXW_UINT32_HOST(width);
/* Set the image metadata. */
image_options->image_type = LXW_IMAGE_BMP;
image_options->width = width;
image_options->height = height;
image_options->x_dpi = x_dpi;
image_options->y_dpi = y_dpi;
image_options->extension = lxw_strdup("bmp");
image_props->image_type = LXW_IMAGE_BMP;
image_props->width = width;
image_props->height = height;
image_props->x_dpi = x_dpi;
image_props->y_dpi = y_dpi;
image_props->extension = lxw_strdup("bmp");
return LXW_NO_ERROR;
file_error:
LXW_WARN_FORMAT1("worksheet_insert_image()/_opt(): "
"no size data found in: %s.", image_options->filename);
"no size data found in: %s.", image_props->filename);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
@ -2455,34 +2455,34 @@ file_error:
* and extension.
*/
STATIC lxw_error
_get_image_properties(lxw_image_options *image_options)
_get_image_properties(lxw_object_properties *image_props)
{
unsigned char signature[4];
/* Read 4 bytes to look for the file header/signature. */
if (fread(signature, 1, 4, image_options->stream) < 4) {
if (fread(signature, 1, 4, image_props->stream) < 4) {
LXW_WARN_FORMAT1("worksheet_insert_image()/_opt(): "
"couldn't read image type for: %s.",
image_options->filename);
image_props->filename);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
if (memcmp(&signature[1], "PNG", 3) == 0) {
if (_process_png(image_options) != LXW_NO_ERROR)
if (_process_png(image_props) != LXW_NO_ERROR)
return LXW_ERROR_IMAGE_DIMENSIONS;
}
else if (signature[0] == 0xFF && signature[1] == 0xD8) {
if (_process_jpeg(image_options) != LXW_NO_ERROR)
if (_process_jpeg(image_props) != LXW_NO_ERROR)
return LXW_ERROR_IMAGE_DIMENSIONS;
}
else if (memcmp(signature, "BM", 2) == 0) {
if (_process_bmp(image_options) != LXW_NO_ERROR)
if (_process_bmp(image_props) != LXW_NO_ERROR)
return LXW_ERROR_IMAGE_DIMENSIONS;
}
else {
LXW_WARN_FORMAT1("worksheet_insert_image()/_opt(): "
"unsupported image format for: %s.",
image_options->filename);
image_props->filename);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
@ -5535,7 +5535,7 @@ worksheet_insert_image_opt(lxw_worksheet *self,
{
FILE *image_stream;
char *description;
lxw_image_options *options;
lxw_object_properties *object_props;
if (!filename) {
LXW_WARN("worksheet_insert_image()/_opt(): "
@ -5561,43 +5561,43 @@ worksheet_insert_image_opt(lxw_worksheet *self,
return LXW_ERROR_PARAMETER_VALIDATION;
}
/* Create a new object to hold the image options. */
options = calloc(1, sizeof(lxw_image_options));
if (!options) {
/* Create a new object to hold the image properties. */
object_props = calloc(1, sizeof(lxw_object_properties));
if (!object_props) {
fclose(image_stream);
return 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;
if (user_options->description)
description = user_options->description;
}
/* Copy other options or set defaults. */
options->filename = lxw_strdup(filename);
options->description = lxw_strdup(description);
options->stream = image_stream;
options->row = row_num;
options->col = col_num;
object_props->filename = lxw_strdup(filename);
object_props->description = lxw_strdup(description);
object_props->stream = image_stream;
object_props->row = row_num;
object_props->col = col_num;
if (!options->x_scale)
options->x_scale = 1;
if (!object_props->x_scale)
object_props->x_scale = 1;
if (!options->y_scale)
options->y_scale = 1;
if (!object_props->y_scale)
object_props->y_scale = 1;
if (_get_image_properties(options) == LXW_NO_ERROR) {
STAILQ_INSERT_TAIL(self->image_data, options, list_pointers);
if (_get_image_properties(object_props) == LXW_NO_ERROR) {
STAILQ_INSERT_TAIL(self->image_props, object_props, list_pointers);
fclose(image_stream);
return LXW_NO_ERROR;
}
else {
_free_image_options(options);
_free_object_properties(object_props);
fclose(image_stream);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
@ -5623,7 +5623,7 @@ worksheet_insert_image_buffer_opt(lxw_worksheet *self,
lxw_image_options *user_options)
{
FILE *image_stream;
lxw_image_options *options;
lxw_object_properties *object_props;
if (!image_size) {
LXW_WARN("worksheet_insert_image_buffer()/_opt(): "
@ -5644,53 +5644,53 @@ worksheet_insert_image_buffer_opt(lxw_worksheet *self,
rewind(image_stream);
/* Create a new object to hold the image options. */
options = calloc(1, sizeof(lxw_image_options));
if (!options) {
/* Create a new object to hold the image properties. */
object_props = calloc(1, sizeof(lxw_object_properties));
if (!object_props) {
fclose(image_stream);
return LXW_ERROR_MEMORY_MALLOC_FAILED;
}
/* Store the image data in the options structure. */
options->image_buffer = calloc(1, image_size);
if (!options->image_buffer) {
_free_image_options(options);
/* Store the image data in the properties structure. */
object_props->image_buffer = calloc(1, image_size);
if (!object_props->image_buffer) {
_free_object_properties(object_props);
fclose(image_stream);
return LXW_ERROR_MEMORY_MALLOC_FAILED;
}
else {
memcpy(options->image_buffer, image_buffer, image_size);
options->image_buffer_size = image_size;
options->is_image_buffer = LXW_TRUE;
memcpy(object_props->image_buffer, image_buffer, image_size);
object_props->image_buffer_size = image_size;
object_props->is_image_buffer = LXW_TRUE;
}
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;
options->description = lxw_strdup(user_options->description);
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;
object_props->description = lxw_strdup(user_options->description);
}
/* Copy other options or set defaults. */
options->filename = lxw_strdup("image_buffer");
options->stream = image_stream;
options->row = row_num;
options->col = col_num;
object_props->filename = lxw_strdup("image_buffer");
object_props->stream = image_stream;
object_props->row = row_num;
object_props->col = col_num;
if (!options->x_scale)
options->x_scale = 1;
if (!object_props->x_scale)
object_props->x_scale = 1;
if (!options->y_scale)
options->y_scale = 1;
if (!object_props->y_scale)
object_props->y_scale = 1;
if (_get_image_properties(options) == LXW_NO_ERROR) {
STAILQ_INSERT_TAIL(self->image_data, options, list_pointers);
if (_get_image_properties(object_props) == LXW_NO_ERROR) {
STAILQ_INSERT_TAIL(self->image_props, object_props, list_pointers);
fclose(image_stream);
return LXW_NO_ERROR;
}
else {
_free_image_options(options);
_free_object_properties(object_props);
fclose(image_stream);
return LXW_ERROR_IMAGE_DIMENSIONS;
}
@ -5713,9 +5713,9 @@ worksheet_insert_image_buffer(lxw_worksheet *self,
lxw_error
worksheet_insert_chart_opt(lxw_worksheet *self,
lxw_row_t row_num, lxw_col_t col_num,
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) {
@ -5749,35 +5749,35 @@ worksheet_insert_chart_opt(lxw_worksheet *self,
}
}
/* 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;
}
/* Copy other options or set defaults. */
options->row = row_num;
options->col = col_num;
object_props->row = row_num;
object_props->col = col_num;
/* 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)
object_props->x_scale = 1;
if (!options->y_scale)
options->y_scale = 1;
if (!object_props->y_scale)
object_props->y_scale = 1;
/* Store chart references so they can be ordered in the workbook. */
options->chart = chart;
object_props->chart = chart;
STAILQ_INSERT_TAIL(self->chart_data, options, list_pointers);
STAILQ_INSERT_TAIL(self->chart_data, object_props, list_pointers);
chart->in_use = LXW_TRUE;

2
test/functional/src/test_chart_size01.c
View File

@ -36,7 +36,7 @@ int main() {
chart_add_series(chart, NULL, "=Sheet1!$B$1:$B$5");
chart_add_series(chart, NULL, "=Sheet1!$C$1:$C$5");
lxw_image_options options = {.x_scale = 1.06666667, .y_scale = 1.11111112};
lxw_chart_options options = {.x_scale = 1.06666667, .y_scale = 1.11111112};
worksheet_insert_chart_opt(worksheet, CELL("E9"), chart, &options);
return workbook_close(workbook);

2
test/functional/src/test_chart_size04.c
View File

@ -36,7 +36,7 @@ int main() {
chart_add_series(chart, NULL, "=Sheet1!$B$1:$B$5");
chart_add_series(chart, NULL, "=Sheet1!$C$1:$C$5");
lxw_image_options options = {.x_offset = 8, .y_offset = 9};
lxw_chart_options options = {.x_offset = 8, .y_offset = 9};
worksheet_insert_chart_opt(worksheet, CELL("E9"), chart, &options);
return workbook_close(workbook);