ext/xlsxwriter/libxlsxwriter/src/drawing.c in xlsxwriter-0.2.0 vs ext/xlsxwriter/libxlsxwriter/src/drawing.c in xlsxwriter-0.2.1.pre

- old
+ new

@@ -223,11 +223,11 @@ /* * Write the <xdr:cNvPr> element. */ STATIC void -_drawing_write_c_nv_pr(lxw_drawing *self, char *object_name, uint16_t index, +_drawing_write_c_nv_pr(lxw_drawing *self, char *object_name, uint32_t index, lxw_drawing_object *drawing_object) { struct xml_attribute_list attributes; struct xml_attribute *attribute; @@ -280,11 +280,11 @@ /* * Write the <xdr:nvPicPr> element. */ STATIC void -_drawing_write_nv_pic_pr(lxw_drawing *self, uint16_t index, +_drawing_write_nv_pic_pr(lxw_drawing *self, uint32_t index, lxw_drawing_object *drawing_object) { lxw_xml_start_tag(self->file, "xdr:nvPicPr", NULL); /* Write the xdr:cNvPr element. */ @@ -298,11 +298,11 @@ /* * Write the <a:blip> element. */ STATIC void -_drawing_write_a_blip(lxw_drawing *self, uint16_t index) +_drawing_write_a_blip(lxw_drawing *self, uint32_t index) { struct xml_attribute_list attributes; struct xml_attribute *attribute; char xmlns_r[] = LXW_SCHEMA_OFFICEDOC "/relationships"; char r_id[LXW_MAX_ATTRIBUTE_LENGTH]; @@ -343,11 +343,11 @@ /* * Write the <xdr:blipFill> element. */ STATIC void -_drawing_write_blip_fill(lxw_drawing *self, uint16_t index) +_drawing_write_blip_fill(lxw_drawing *self, uint32_t index) { lxw_xml_start_tag(self->file, "xdr:blipFill", NULL); /* Write the a:blip element. */ _drawing_write_a_blip(self, index); @@ -461,11 +461,11 @@ /* * Write the <xdr:pic> element. */ STATIC void -_drawing_write_pic(lxw_drawing *self, uint16_t index, +_drawing_write_pic(lxw_drawing *self, uint32_t index, lxw_drawing_object *drawing_object) { lxw_xml_start_tag(self->file, "xdr:pic", NULL); /* Write the xdr:nvPicPr element. */ @@ -527,11 +527,11 @@ /* * Write the <xdr:nvGraphicFramePr> element. */ STATIC void -_drawing_write_nv_graphic_frame_pr(lxw_drawing *self, uint16_t index) +_drawing_write_nv_graphic_frame_pr(lxw_drawing *self, uint32_t index) { lxw_xml_start_tag(self->file, "xdr:nvGraphicFramePr", NULL); /* Write the xdr:cNvPr element. */ _drawing_write_c_nv_pr(self, "Chart", index, NULL); @@ -597,11 +597,11 @@ /* * Write the <c:chart> element. */ STATIC void -_drawing_write_chart(lxw_drawing *self, uint16_t index) +_drawing_write_chart(lxw_drawing *self, uint32_t index) { struct xml_attribute_list attributes; struct xml_attribute *attribute; char xmlns_c[] = LXW_SCHEMA_DRAWING "/chart"; char xmlns_r[] = LXW_SCHEMA_OFFICEDOC "/relationships"; @@ -621,11 +621,11 @@ /* * Write the <a:graphicData> element. */ STATIC void -_drawing_write_a_graphic_data(lxw_drawing *self, uint16_t index) +_drawing_write_a_graphic_data(lxw_drawing *self, uint32_t index) { struct xml_attribute_list attributes; struct xml_attribute *attribute; char uri[] = LXW_SCHEMA_DRAWING "/chart"; @@ -644,11 +644,11 @@ /* * Write the <a:graphic> element. */ STATIC void -_drawing_write_a_graphic(lxw_drawing *self, uint16_t index) +_drawing_write_a_graphic(lxw_drawing *self, uint32_t index) { lxw_xml_start_tag(self->file, "a:graphic", NULL); /* Write the a:graphicData element. */ @@ -659,11 +659,11 @@ /* * Write the <xdr:graphicFrame> element. */ STATIC void -_drawing_write_graphic_frame(lxw_drawing *self, uint16_t index) +_drawing_write_graphic_frame(lxw_drawing *self, uint32_t index) { struct xml_attribute_list attributes; struct xml_attribute *attribute; LXW_INIT_ATTRIBUTES(); @@ -687,11 +687,11 @@ /* * Write the <xdr:twoCellAnchor> element. */ STATIC void -_drawing_write_two_cell_anchor(lxw_drawing *self, uint16_t index, +_drawing_write_two_cell_anchor(lxw_drawing *self, uint32_t index, lxw_drawing_object *drawing_object) { struct xml_attribute_list attributes; struct xml_attribute *attribute; @@ -809,10 +809,10 @@ * Assemble and write the XML file. */ void lxw_drawing_assemble_xml_file(lxw_drawing *self) { - uint16_t index; + uint32_t index; lxw_drawing_object *drawing_object; /* Write the XML declaration. */ _drawing_xml_declaration(self);