summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2016-10-04 11:55:28 +1030
committerAdrian Johnson <ajohnson@redneon.com>2016-10-04 12:00:30 +1030
commit55f8c6d9f4161f5ee2a11fd068f0ccb25a5b3aed (patch)
tree22eae450058509c3dd9841a024281dd47d61a22b
parent3c33d9704119d0178230a0cf9929941592836eab (diff)
fix compiler warnings
-rw-r--r--src/cairo-pdf-interchange.c6
-rw-r--r--src/cairo-tag-attributes.c2
-rw-r--r--test/pdf-tagged-text.c1
-rw-r--r--util/cairo-trace/trace.c1
4 files changed, 6 insertions, 4 deletions
diff --git a/src/cairo-pdf-interchange.c b/src/cairo-pdf-interchange.c
index 622f3b3f3..fc21b32c2 100644
--- a/src/cairo-pdf-interchange.c
+++ b/src/cairo-pdf-interchange.c
@@ -757,7 +757,7 @@ _cairo_pdf_interchange_write_document_dests (cairo_pdf_surface_t *surface)
cairo_pdf_named_dest_t *dest = ic->sorted_dests[i];
cairo_pdf_resource_t page_res;
double x = 0;
- double y = y;
+ double y = 0;
if (dest->extents.valid) {
x = dest->extents.extents.x;
@@ -959,7 +959,7 @@ _cairo_pdf_interchange_tag_begin (cairo_pdf_surface_t *surface,
const char *name,
const char *attributes)
{
- cairo_int_status_t status;
+ cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
cairo_tag_type_t tag_type;
cairo_pdf_interchange_t *ic = &surface->interchange;
void *ptr;
@@ -1061,7 +1061,7 @@ cairo_int_status_t
_cairo_pdf_interchange_tag_end (cairo_pdf_surface_t *surface,
const char *name)
{
- cairo_int_status_t status;
+ cairo_int_status_t status = CAIRO_STATUS_SUCCESS;
cairo_pdf_interchange_t *ic = &surface->interchange;
cairo_tag_type_t tag_type;
cairo_tag_stack_elem_t *elem;
diff --git a/src/cairo-tag-attributes.c b/src/cairo-tag-attributes.c
index 53433082c..685c26af6 100644
--- a/src/cairo-tag-attributes.c
+++ b/src/cairo-tag-attributes.c
@@ -314,7 +314,7 @@ parse_attributes (const char *attributes, attribute_spec_t *attrib_def, cairo_li
{
attribute_spec_t *def;
attribute_t *attrib;
- char *name;
+ char *name = NULL;
cairo_int_status_t status;
const char *p = attributes;
diff --git a/test/pdf-tagged-text.c b/test/pdf-tagged-text.c
index 91b917f63..e8484f071 100644
--- a/test/pdf-tagged-text.c
+++ b/test/pdf-tagged-text.c
@@ -123,6 +123,7 @@ layout_paragraph (cairo_t *cr)
text = strdup (ipsum_lorem);
begin = text;
end = text;
+ prev_end = end;
while (*begin) {
end = strchr(end, ' ');
if (!end) {
diff --git a/util/cairo-trace/trace.c b/util/cairo-trace/trace.c
index e3c99331b..3c056134e 100644
--- a/util/cairo-trace/trace.c
+++ b/util/cairo-trace/trace.c
@@ -1585,6 +1585,7 @@ _status_to_string (cairo_status_t status)
f(PNG_ERROR);
f(FREETYPE_ERROR);
f(WIN32_GDI_ERROR);
+ f(TAG_ERROR);
case CAIRO_STATUS_LAST_STATUS:
break;
}