[cairo-commit] libsvg/src Makefile.am, 1.8, 1.9 svg.c, 1.11,
1.12 svg.h, 1.19, 1.20 svg_ascii.c, 1.2, 1.3 svg_ascii.h, 1.2,
1.3 svg_attribute.c, 1.3, 1.4 svg_element.c, 1.35,
1.36 svg_gradient.c, 1.5, 1.6 svg_group.c, 1.26,
1.27 svg_image.c, 1.13, 1.14 svg_paint.c, 1.5,
1.6 svg_parser.c, 1.33, 1.34 svg_parser_libxml.c, 1.1,
1.2 svg_path.c, 1.18, 1.19 svg_pattern.c, 1.1, 1.2 svg_style.c,
1.19, 1.20 svg_text.c, 1.10, 1.11 svg_transform.c, 1.10,
1.11 svgint.h, 1.43, 1.44
Carl Worth
commit at pdx.freedesktop.org
Mon Apr 11 09:20:12 PDT 2005
Committed by: cworth
Update of /cvs/cairo/libsvg/src
In directory gabe:/tmp/cvs-serv14294/src
Modified Files:
Makefile.am svg.c svg.h svg_ascii.c svg_ascii.h
svg_attribute.c svg_element.c svg_gradient.c svg_group.c
svg_image.c svg_paint.c svg_parser.c svg_parser_libxml.c
svg_path.c svg_pattern.c svg_style.c svg_text.c
svg_transform.c svgint.h
Log Message:
* src/Makefile.am:
* configure.in: Enable a bunch of useful warnings when using gcc.
* src/svg_ascii.h:
* src/svg_ascii.c: (_svg_ascii_strtod): Fix indentation.
Fixes for more strict signedness checks as of gcc version 4:
* src/svg_element.c: (_svg_element_init_copy),
(_svg_element_apply_attributes): Cast to unsigned char* just
before calling into libxml routines.
* src/svg.h: Change render_text callback to accept char* instead
of unsigned char *.
* src/svg_parser_libxml.c: Move prototypes for
_svg_parser_sax_start_element, _svg_parser_sax_end_element, and
_svg_parser_sax_characters into svgint.h where they belong.
Use xmlStrdup instead of xmlMemStrdup for correct signedness.
* src/svg_attribute.c:
* src/svg.c:
* src/svg_gradient.c:
* src/svg_group.c:
* src/svg_image.c:
* src/svg_paint.c:
* src/svg_parser.c:
* src/svg_path.c:
* src/svg_pattern.c:
* src/svg_style.c:
* src/svg_text.c:
* src/svg_transform.c:
* src/svgint.h: Prefer char* over xmlChar* for internal use.
Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/libsvg/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 14 Feb 2005 17:26:26 -0000 1.8
+++ Makefile.am 11 Apr 2005 16:20:09 -0000 1.9
@@ -33,7 +33,7 @@
libsvg_la_LDFLAGS = -version-info @VERSION_INFO@
-INCLUDES = $(LIBSVG_CFLAGS)
+INCLUDES = $(LIBSVG_CFLAGS) $(WARN_CFLAGS)
libsvg_la_LIBADD = $(LIBSVG_LIBS)
Index: svg.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- svg.c 28 Feb 2005 23:31:59 -0000 1.11
+++ svg.c 11 Apr 2005 16:20:09 -0000 1.12
@@ -229,15 +229,17 @@
svg_status_t
_svg_store_element_by_id (svg_t *svg, svg_element_t *element)
{
- _svg_xml_hash_add_entry (svg->element_ids, element->id, element);
+ _svg_xml_hash_add_entry (svg->element_ids,
+ (unsigned char *)element->id,
+ element);
return SVG_STATUS_SUCCESS;
}
svg_status_t
-_svg_fetch_element_by_id (svg_t *svg, const xmlChar *id, svg_element_t **element_ret)
+_svg_fetch_element_by_id (svg_t *svg, const char *id, svg_element_t **element_ret)
{
- *element_ret = _svg_xml_hash_lookup (svg->element_ids, id);
+ *element_ret = _svg_xml_hash_lookup (svg->element_ids, (unsigned char *)id);
return SVG_STATUS_SUCCESS;
}
Index: svg.h
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- svg.h 15 Dec 2003 15:55:05 -0000 1.19
+++ svg.h 11 Apr 2005 16:20:09 -0000 1.20
@@ -299,7 +299,7 @@
svg_status_t (* render_text) (void *closure,
svg_length_t *x,
svg_length_t *y,
- unsigned char *utf8);
+ char *utf8);
svg_status_t (* render_image) (void *closure,
unsigned char *data,
unsigned int data_width,
Index: svg_ascii.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_ascii.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svg_ascii.c 25 Jan 2003 19:07:34 -0000 1.2
+++ svg_ascii.c 11 Apr 2005 16:20:09 -0000 1.3
@@ -94,8 +94,8 @@
* Return value: the #double value.
**/
double
-_svg_ascii_strtod (const char *nptr,
- const char **endptr)
+_svg_ascii_strtod (const char *nptr,
+ const char **endptr)
{
char *fail_pos;
double val;
Index: svg_ascii.h
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_ascii.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- svg_ascii.h 4 Mar 2003 02:53:17 -0000 1.2
+++ svg_ascii.h 11 Apr 2005 16:20:09 -0000 1.3
@@ -98,7 +98,7 @@
double
_svg_ascii_strtod (const char *nptr,
- const char **endptr);
+ const char **endptr);
int
_svg_ascii_strcasecmp (const char *s1,
Index: svg_attribute.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_attribute.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- svg_attribute.c 8 Feb 2003 19:38:42 -0000 1.3
+++ svg_attribute.c 11 Apr 2005 16:20:09 -0000 1.4
@@ -25,10 +25,10 @@
#include "svgint.h"
svgint_status_t
-_svg_attribute_get_double (const xmlChar **attributes,
- const xmlChar *name,
- double *value,
- double default_value)
+_svg_attribute_get_double (const char **attributes,
+ const char *name,
+ double *value,
+ double default_value)
{
int i;
@@ -48,10 +48,10 @@
}
svgint_status_t
-_svg_attribute_get_string (const xmlChar **attributes,
- const xmlChar *name,
- const xmlChar **value,
- const xmlChar *default_value)
+_svg_attribute_get_string (const char **attributes,
+ const char *name,
+ const char **value,
+ const char *default_value)
{
int i;
@@ -71,10 +71,10 @@
}
svgint_status_t
-_svg_attribute_get_length (const xmlChar **attributes,
- const xmlChar *name,
- svg_length_t *value,
- const xmlChar *default_value)
+_svg_attribute_get_length (const char **attributes,
+ const char *name,
+ svg_length_t *value,
+ const char *default_value)
{
int i;
Index: svg_element.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_element.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- svg_element.c 14 Feb 2005 17:26:26 -0000 1.35
+++ svg_element.c 11 Apr 2005 16:20:09 -0000 1.36
@@ -110,7 +110,7 @@
element->type = other->type;
element->parent = other->parent;
if (other->id)
- element->id = _svg_xml_strdup (other->id);
+ element->id = strdup (other->id);
else
element->id = NULL;
@@ -459,10 +459,10 @@
svg_status_t
_svg_element_apply_attributes (svg_element_t *element,
- const xmlChar **attributes)
+ const char **attributes)
{
svg_status_t status;
- const xmlChar *id;
+ const char *id;
status = _svg_transform_apply_attributes (&element->transform, attributes);
if (status)
@@ -474,7 +474,7 @@
_svg_attribute_get_string (attributes, "id", &id, NULL);
if (id)
- element->id = _svg_xml_strdup (id);
+ element->id = strdup (id);
switch (element->type) {
case SVG_ELEMENT_TYPE_SVG_GROUP:
Index: svg_gradient.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_gradient.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- svg_gradient.c 23 Dec 2004 22:00:01 -0000 1.5
+++ svg_gradient.c 11 Apr 2005 16:20:09 -0000 1.6
@@ -132,13 +132,13 @@
svg_status_t
_svg_gradient_apply_attributes (svg_gradient_t *gradient,
svg_t *svg,
- const xmlChar **attributes)
+ const char **attributes)
{
svgint_status_t status;
- const xmlChar *href;
+ const char *href;
int i;
svg_transform_t transform;
- xmlChar const* str;
+ const char *str;
svg_gradient_t* prototype = 0;
/* SPK: still an incomplete set of attributes */
Index: svg_group.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_group.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- svg_group.c 23 Dec 2004 22:00:01 -0000 1.26
+++ svg_group.c 11 Apr 2005 16:20:09 -0000 1.27
@@ -144,9 +144,9 @@
/* Apply attributes unique to `svg' elements */
svg_status_t
_svg_group_apply_svg_attributes (svg_group_t *group,
- const xmlChar **attributes)
+ const char **attributes)
{
- const xmlChar *view_box_str, *aspect_ratio_str;
+ const char *view_box_str, *aspect_ratio_str;
svgint_status_t status;
_svg_attribute_get_length (attributes, "width", &group->width, "100%");
@@ -178,7 +178,7 @@
/* Apply attributes common to `svg' and `g' elements */
svg_status_t
_svg_group_apply_group_attributes (svg_group_t *group,
- const xmlChar **attributes)
+ const char **attributes)
{
/* XXX: NYI */
@@ -187,9 +187,9 @@
svg_status_t
_svg_group_apply_use_attributes (svg_element_t *group,
- const xmlChar **attributes)
+ const char **attributes)
{
- const xmlChar *href;
+ const char *href;
svg_element_t *ref;
svg_element_t *clone;
svgint_status_t status;
Index: svg_image.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_image.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- svg_image.c 4 May 2004 16:18:07 -0000 1.13
+++ svg_image.c 11 Apr 2005 16:20:09 -0000 1.14
@@ -89,9 +89,9 @@
svg_status_t
_svg_image_apply_attributes (svg_image_t *image,
- const xmlChar **attributes)
+ const char **attributes)
{
- const xmlChar *aspect, *href;
+ const char *aspect, *href;
_svg_attribute_get_length (attributes, "x", &image->x, "0");
_svg_attribute_get_length (attributes, "y", &image->y, "0");
Index: svg_paint.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_paint.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- svg_paint.c 30 Aug 2003 03:09:07 -0000 1.5
+++ svg_paint.c 11 Apr 2005 16:20:09 -0000 1.6
@@ -25,7 +25,7 @@
#include "svgint.h"
svg_status_t
-_svg_paint_init (svg_paint_t *paint, svg_t *svg, const xmlChar *str)
+_svg_paint_init (svg_paint_t *paint, svg_t *svg, const char *str)
{
svg_status_t status;
@@ -37,9 +37,9 @@
/* Paint parser courtesy of Steven Kramer */
if (strncmp (str, "url(#", 5) == 0 && strchr (str, ')')) {
svg_element_t *element = NULL;
- const xmlChar *end = strchr (str, ')');
+ const char *end = strchr (str, ')');
int length = end - (str + 5);
- xmlChar *id = malloc (length+1);
+ char *id = malloc (length+1);
if (!id)
return SVG_STATUS_NO_MEMORY;
Index: svg_parser.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_parser.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- svg_parser.c 14 Feb 2005 17:26:26 -0000 1.33
+++ svg_parser.c 11 Apr 2005 16:20:09 -0000 1.34
@@ -50,102 +50,102 @@
static svg_status_t
_svg_parser_parse_anchor (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element);
static svg_status_t
_svg_parser_parse_svg (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element);
static svg_status_t
_svg_parser_parse_defs (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element);
static svg_status_t
_svg_parser_parse_use (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element);
static svg_status_t
_svg_parser_parse_symbol (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element);
static svg_status_t
_svg_parser_parse_group (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element);
static svg_status_t
_svg_parser_parse_path (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_line (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_rect (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_circle (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_ellipse (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_polygon (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_polyline (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_text (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **text_element);
static svg_status_t
_svg_parser_parse_image (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **image_element);
static svg_status_t
_svg_parser_parse_linear_gradient (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_radial_gradient (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_gradient_stop (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **stop_element);
static svg_status_t
_svg_parser_parse_pattern (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element);
static svg_status_t
_svg_parser_parse_text_characters (svg_parser_t *parser,
- const xmlChar *ch,
+ const char *ch,
int len);
typedef struct svg_parser_map {
@@ -178,13 +178,15 @@
void
_svg_parser_sax_start_element (void *closure,
- const xmlChar *name,
- const xmlChar **attributes)
+ const xmlChar *name_unsigned,
+ const xmlChar **attributes_unsigned)
{
unsigned int i;
svg_parser_t *parser = closure;
const svg_parser_cb_t *cb;
svg_element_t *element;
+ const char *name = (const char *) name_unsigned;
+ const char **attributes = (const char **) attributes_unsigned;
if (parser->unknown_element_depth) {
parser->unknown_element_depth++;
@@ -245,13 +247,13 @@
void
_svg_parser_sax_characters (void *closure,
- const xmlChar *ch,
+ const xmlChar *ch_unsigned,
int len)
{
int i;
svg_parser_t *parser = closure;
- const xmlChar *src;
- xmlChar *ch_copy, *dst;
+ const char *src, *ch = (const char *) ch_unsigned;
+ char *ch_copy, *dst;
int space;
/* XXX: This is the correct default behavior, but we're supposed
@@ -399,7 +401,7 @@
static svg_status_t
_svg_parser_parse_anchor (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element)
{
/* XXX: Currently ignoring all anchor elements */
@@ -408,7 +410,7 @@
static svg_status_t
_svg_parser_parse_svg (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element)
{
return _svg_parser_new_svg_group_element (parser, group_element);
@@ -416,7 +418,7 @@
static svg_status_t
_svg_parser_parse_group (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element)
{
return _svg_parser_new_group_element (parser, group_element, SVG_ELEMENT_TYPE_GROUP);
@@ -424,7 +426,7 @@
static svg_status_t
_svg_parser_parse_defs (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element)
{
return _svg_parser_new_group_element (parser, group_element, SVG_ELEMENT_TYPE_DEFS);
@@ -432,7 +434,7 @@
static svg_status_t
_svg_parser_parse_use (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element)
{
return _svg_parser_new_group_element (parser, group_element, SVG_ELEMENT_TYPE_USE);
@@ -440,7 +442,7 @@
static svg_status_t
_svg_parser_parse_symbol (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **group_element)
{
return _svg_parser_new_group_element (parser, group_element, SVG_ELEMENT_TYPE_SYMBOL);
@@ -448,7 +450,7 @@
static svg_status_t
_svg_parser_parse_path (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
return _svg_parser_new_leaf_element (parser,
@@ -458,7 +460,7 @@
static svg_status_t
_svg_parser_parse_line (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
svg_status_t status;
@@ -478,7 +480,7 @@
static svg_status_t
_svg_parser_parse_rect (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
svg_status_t status;
@@ -510,7 +512,7 @@
static svg_status_t
_svg_parser_parse_circle (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
svg_status_t status;
@@ -531,7 +533,7 @@
static svg_status_t
_svg_parser_parse_ellipse (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
svg_status_t status;
@@ -552,7 +554,7 @@
static svg_status_t
_svg_parser_parse_polygon (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
svg_status_t status;
@@ -575,11 +577,11 @@
static svg_status_t
_svg_parser_parse_polyline (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **path_element)
{
svg_status_t status;
- const xmlChar *points;
+ const char *points;
const char *p, *next;
svg_path_t *path;
double pt[2];
@@ -620,7 +622,7 @@
static svg_status_t
_svg_parser_parse_text (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **text_element)
{
svg_status_t status;
@@ -638,7 +640,7 @@
static svg_status_t
_svg_parser_parse_image (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **image_element)
{
return _svg_parser_new_leaf_element (parser,
@@ -650,7 +652,7 @@
static svg_status_t
_svg_parser_parse_linear_gradient (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **gradient_element)
{
svg_status_t status;
@@ -675,7 +677,7 @@
static svg_status_t
_svg_parser_parse_radial_gradient (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **gradient_element)
{
svg_status_t status;
@@ -701,7 +703,7 @@
into an array when the gradient is done being parsed. */
static svg_status_t
_svg_parser_parse_gradient_stop (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **gradient_element)
{
svg_style_t style;
@@ -709,7 +711,7 @@
double offset;
double opacity;
svg_color_t color;
- const xmlChar* color_str;
+ const char* color_str;
svg_element_t *group_element;
gradient_element = NULL;
@@ -747,7 +749,7 @@
static svg_status_t
_svg_parser_parse_pattern (svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **pattern_element)
{
svg_status_t status;
@@ -768,7 +770,7 @@
static svg_status_t
_svg_parser_parse_text_characters (svg_parser_t *parser,
- const xmlChar *ch,
+ const char *ch,
int len)
{
svg_status_t status;
Index: svg_parser_libxml.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_parser_libxml.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svg_parser_libxml.c 14 Feb 2005 17:26:26 -0000 1.1
+++ svg_parser_libxml.c 11 Apr 2005 16:20:09 -0000 1.2
@@ -40,21 +40,6 @@
const xmlChar *systemId,
xmlChar *content);
-
-static void
-_svg_parser_sax_start_element (void *closure,
- const xmlChar *name,
- const xmlChar **atts);
-
-static void
-_svg_parser_sax_end_element (void *closure,
- const xmlChar *name);
-
-static void
-_svg_parser_sax_characters (void *closure,
- const xmlChar *ch,
- int len);
-
static void
_svg_parser_sax_warning (void *closure,
const char *msg, ...);
@@ -199,14 +184,14 @@
entity = malloc (sizeof(xmlEntity));
entity->type = XML_ENTITY_DECL;
- entity->name = xmlMemStrdup (name);
+ entity->name = xmlStrdup (name);
entity->etype = type;
if (publicId)
- entity->ExternalID = xmlMemStrdup (publicId);
+ entity->ExternalID = xmlStrdup (publicId);
else
entity->ExternalID = NULL;
if (systemId)
- entity->SystemID = xmlMemStrdup (systemId);
+ entity->SystemID = xmlStrdup (systemId);
else
entity->SystemID = NULL;
Index: svg_path.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_path.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- svg_path.c 30 Apr 2004 06:50:33 -0000 1.18
+++ svg_path.c 11 Apr 2005 16:20:09 -0000 1.19
@@ -349,10 +349,10 @@
svg_status_t
_svg_path_apply_attributes (svg_path_t *path,
- const xmlChar **attributes)
+ const char **attributes)
{
svg_status_t status;
- const xmlChar *path_str;
+ const char *path_str;
if (_svg_path_is_empty (path)) {
_svg_attribute_get_string (attributes, "d", &path_str, NULL);
@@ -384,9 +384,9 @@
}
svg_status_t
-_svg_path_add_from_str (svg_path_t *path, const xmlChar *path_str)
+_svg_path_add_from_str (svg_path_t *path, const char *path_str)
{
- const xmlChar *s;
+ const char *s;
const char *end;
svg_status_t status;
const svg_path_cmd_info_t *cmd_info;
Index: svg_pattern.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_pattern.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- svg_pattern.c 30 Aug 2003 03:09:07 -0000 1.1
+++ svg_pattern.c 11 Apr 2005 16:20:09 -0000 1.2
@@ -65,11 +65,11 @@
svg_status_t
_svg_pattern_apply_attributes (svg_pattern_t *pattern,
- const xmlChar **attributes)
+ const char **attributes)
{
int i;
svg_transform_t transform;
- xmlChar const* str;
+ char const* str;
_svg_attribute_get_string (attributes, "patternUnits", &str, "objectBoundingBox");
if (strcmp (str, "userSpaceOnUse") == 0) {
Index: svg_style.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_style.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- svg_style.c 27 Apr 2004 00:37:57 -0000 1.19
+++ svg_style.c 11 Apr 2005 16:20:09 -0000 1.20
@@ -26,86 +26,86 @@
#include "svgint.h"
static svg_status_t
-_svg_style_parse_color (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_color (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_display (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_display (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_fill_opacity (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_fill_opacity (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_fill_paint (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_fill_paint (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_fill_rule (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_fill_rule (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_font_family (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_font_family (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_font_size (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_font_size (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_font_style (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_font_style (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_font_weight (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_font_weight (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_opacity (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_opacity (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_dash_array (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_dash_array (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_dash_offset (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_dash_offset (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_line_cap (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_line_cap (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_line_join (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_line_join (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_miter_limit (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_miter_limit (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_opacity (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_opacity (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_paint (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_paint (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stroke_width (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stroke_width (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_text_anchor (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_text_anchor (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_visibility (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_visibility (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stop_color (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stop_color (svg_style_t *style, const char *str);
static svg_status_t
-_svg_style_parse_stop_opacity (svg_style_t *style, const xmlChar *str);
+_svg_style_parse_stop_opacity (svg_style_t *style, const char *str);
static svg_status_t
_svg_style_str_to_opacity (const char *str, double *ret);
static svg_status_t
_svg_style_parse_nv_pair (svg_style_t *style,
- const xmlChar *nv_pair);
+ const char *nv_pair);
static svg_status_t
_svg_style_parse_style_str (svg_style_t *style,
- const xmlChar *str);
+ const char *str);
typedef struct svg_style_parse_map {
- const xmlChar *name;
- svg_status_t (*parse) (svg_style_t *style, const xmlChar *value);
- const xmlChar *default_value;
+ const char *name;
+ svg_status_t (*parse) (svg_style_t *style, const char *value);
+ const char *default_value;
} svg_style_parse_map_t;
static const svg_style_parse_map_t SVG_STYLE_PARSE_MAP[] = {
@@ -241,7 +241,7 @@
}
static svg_status_t
-_svg_style_parse_color (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_color (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -258,7 +258,7 @@
}
static svg_status_t
-_svg_style_parse_fill_opacity (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_fill_opacity (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -272,7 +272,7 @@
}
static svg_status_t
-_svg_style_parse_fill_paint (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_fill_paint (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -286,7 +286,7 @@
}
static svg_status_t
-_svg_style_parse_fill_rule (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_fill_rule (svg_style_t *style, const char *str)
{
if (strcmp (str, "evenodd") == 0)
style->fill_rule = SVG_FILL_RULE_EVEN_ODD;
@@ -302,7 +302,7 @@
}
static svg_status_t
-_svg_style_parse_font_family (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_font_family (svg_style_t *style, const char *str)
{
free (style->font_family);
style->font_family = strdup (str);
@@ -315,7 +315,7 @@
}
static svg_status_t
-_svg_style_parse_font_size (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_font_size (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -329,7 +329,7 @@
}
static svg_status_t
-_svg_style_parse_font_style (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_font_style (svg_style_t *style, const char *str)
{
if (strcmp (str, "normal") == 0)
style->font_style = SVG_FONT_STYLE_NORMAL;
@@ -346,7 +346,7 @@
}
static svg_status_t
-_svg_style_parse_font_weight (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_font_weight (svg_style_t *style, const char *str)
{
if (strcmp (str, "normal") == 0)
style->font_weight = 400;
@@ -370,7 +370,7 @@
}
static svg_status_t
-_svg_style_parse_opacity (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_opacity (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -384,7 +384,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_dash_array (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_dash_array (svg_style_t *style, const char *str)
{
svgint_status_t status;
double *new_dash_array;
@@ -421,7 +421,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_dash_offset (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_dash_offset (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -435,7 +435,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_line_cap (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_line_cap (svg_style_t *style, const char *str)
{
if (strcmp (str, "butt") == 0)
style->stroke_line_cap = SVG_STROKE_LINE_CAP_BUTT;
@@ -453,7 +453,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_line_join (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_line_join (svg_style_t *style, const char *str)
{
if (strcmp (str, "miter") == 0)
style->stroke_line_join = SVG_STROKE_LINE_JOIN_MITER;
@@ -471,7 +471,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_miter_limit (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_miter_limit (svg_style_t *style, const char *str)
{
const char *end;
@@ -485,7 +485,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_opacity (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_opacity (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -499,7 +499,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_paint (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_paint (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -513,7 +513,7 @@
}
static svg_status_t
-_svg_style_parse_stroke_width (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stroke_width (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -527,7 +527,7 @@
}
static svg_status_t
-_svg_style_parse_text_anchor (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_text_anchor (svg_style_t *style, const char *str)
{
if (strcmp (str, "start") == 0)
style->text_anchor = SVG_TEXT_ANCHOR_START;
@@ -544,7 +544,7 @@
}
static svg_status_t
-_svg_style_parse_visibility (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_visibility (svg_style_t *style, const char *str)
{
/* XXX: Do we care about the CSS2 definitions for these? */
if (strcmp (str, "hidden") == 0 || strcmp (str, "collapse") == 0)
@@ -558,7 +558,7 @@
}
static svg_status_t
-_svg_style_parse_display (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_display (svg_style_t *style, const char *str)
{
/* XXX: Do we care about the CSS2 definitions for these? */
if (strcmp (str, "none") == 0)
@@ -579,7 +579,7 @@
}
static svg_status_t
-_svg_style_parse_stop_color (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stop_color (svg_style_t *style, const char *str)
{
svg_status_t status;
@@ -594,7 +594,7 @@
static svg_status_t
-_svg_style_parse_stop_opacity (svg_style_t *style, const xmlChar *str)
+_svg_style_parse_stop_opacity (svg_style_t *style, const char *str)
{
svg_status_t status;
double opacity = 1.0;
@@ -611,9 +611,9 @@
static svg_status_t
-_svg_style_split_nv_pair_alloc (const xmlChar *nv_pair,
- xmlChar **name,
- xmlChar **value)
+_svg_style_split_nv_pair_alloc (const char *nv_pair,
+ char **name,
+ char **value)
{
char *colon;
const char *v_start;
@@ -646,10 +646,10 @@
/* Parse a CSS2 style argument */
static svg_status_t
_svg_style_parse_nv_pair (svg_style_t *style,
- const xmlChar *nv_pair)
+ const char *nv_pair)
{
unsigned int i;
- xmlChar *name, *value;
+ char *name, *value;
svg_status_t status;
status = _svg_style_split_nv_pair_alloc (nv_pair, &name, &value);
@@ -688,7 +688,7 @@
*/
static svg_status_t
_svg_style_parse_style_str (svg_style_t *style,
- const xmlChar *str)
+ const char *str)
{
int start, end;
char *nv_pair;
@@ -713,11 +713,11 @@
svg_status_t
_svg_style_apply_attributes (svg_style_t *style,
- const xmlChar **attributes)
+ const char **attributes)
{
unsigned int i;
svg_status_t status;
- const xmlChar *style_str, *str;
+ const char *style_str, *str;
_svg_attribute_get_string (attributes, "style", &style_str, NULL);
Index: svg_text.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_text.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- svg_text.c 30 Aug 2003 03:09:07 -0000 1.10
+++ svg_text.c 11 Apr 2005 16:20:09 -0000 1.11
@@ -55,7 +55,7 @@
svg_status_t
_svg_text_append_chars (svg_text_t *text,
- const xmlChar *chars,
+ const char *chars,
int len)
{
char *new_chars;
@@ -70,8 +70,8 @@
if (text->chars == NULL)
new_chars[0] = '\0';
- text->chars = (unsigned char*) new_chars;
- strncat ((char*) text->chars, chars, len);
+ text->chars = new_chars;
+ strncat (text->chars, chars, len);
return SVG_STATUS_SUCCESS;
}
@@ -88,7 +88,7 @@
svg_status_t
_svg_text_apply_attributes (svg_text_t *text,
- const xmlChar **attributes)
+ const char **attributes)
{
_svg_attribute_get_length (attributes, "x", &text->x, "0");
_svg_attribute_get_length (attributes, "y", &text->y, "0");
Index: svg_transform.c
===================================================================
RCS file: /cvs/cairo/libsvg/src/svg_transform.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- svg_transform.c 30 Aug 2003 03:09:07 -0000 1.10
+++ svg_transform.c 11 Apr 2005 16:20:09 -0000 1.11
@@ -362,9 +362,9 @@
svg_status_t
_svg_transform_apply_attributes (svg_transform_t *transform,
- const xmlChar **attributes)
+ const char **attributes)
{
- const xmlChar *transform_str;
+ const char *transform_str;
_svg_attribute_get_string (attributes, "transform", &transform_str, NULL);
Index: svgint.h
===================================================================
RCS file: /cvs/cairo/libsvg/src/svgint.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- svgint.h 14 Feb 2005 17:26:26 -0000 1.43
+++ svgint.h 11 Apr 2005 16:20:09 -0000 1.44
@@ -31,8 +31,6 @@
typedef XML_Char xmlChar;
typedef XML_Parser svg_xml_parser_context_t;
-#define _svg_xml_strdup strdup
-
#else
#include <libxml/SAX.h>
@@ -46,7 +44,6 @@
#define _svg_xml_hash_lookup xmlHashLookup
#define _svg_xml_hash_create xmlHashCreate
#define _svg_xml_hash_free(_table) xmlHashFree(_table, NULL)
-#define _svg_xml_strdup xmlMemStrdup
#endif
@@ -240,7 +237,7 @@
typedef struct svg_text {
svg_length_t x;
svg_length_t y;
- unsigned char *chars;
+ char *chars;
unsigned int len;
} svg_text_t;
@@ -310,7 +307,7 @@
svg_element_type_t type;
- xmlChar *id;
+ char *id;
union {
svg_group_t group;
@@ -329,11 +326,11 @@
typedef struct svg_parser svg_parser_t;
typedef svg_status_t (svg_parser_parse_element_t)(svg_parser_t *parser,
- const xmlChar **attributes,
+ const char **attributes,
svg_element_t **element_ret);
typedef svg_status_t (svg_parser_parse_characters_t) (svg_parser_t *parser,
- const xmlChar *ch,
+ const char *ch,
int len);
typedef struct svg_parser_cb {
@@ -385,7 +382,7 @@
_svg_store_element_by_id (svg_t *svg, svg_element_t *element);
svg_status_t
-_svg_fetch_element_by_id (svg_t *svg, const xmlChar *id, svg_element_t **element_ret);
+_svg_fetch_element_by_id (svg_t *svg, const char *id, svg_element_t **element_ret);
/* libsvg_features.c */
@@ -398,22 +395,22 @@
/* svg_attribute.c */
svgint_status_t
-_svg_attribute_get_double (const xmlChar **attributes,
- const xmlChar *name,
- double *value,
- double default_value);
+_svg_attribute_get_double (const char **attributes,
+ const char *name,
+ double *value,
+ double default_value);
svgint_status_t
-_svg_attribute_get_string (const xmlChar **attributes,
- const xmlChar *name,
- const xmlChar **value,
- const xmlChar *default_value);
+_svg_attribute_get_string (const char **attributes,
+ const char *name,
+ const char **value,
+ const char *default_value);
svgint_status_t
-_svg_attribute_get_length (const xmlChar **attributes,
- const xmlChar *name,
- svg_length_t *value,
- const xmlChar *default_value);
+_svg_attribute_get_length (const char **attributes,
+ const char *name,
+ svg_length_t *value,
+ const char *default_value);
/* svg_color.c */
@@ -459,7 +456,7 @@
svg_status_t
_svg_element_apply_attributes (svg_element_t *group_element,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
_svg_element_parse_aspect_ratio (const char *aspect_ratio_str,
@@ -500,7 +497,7 @@
svg_status_t
_svg_gradient_apply_attributes (svg_gradient_t *gradient,
svg_t *svg,
- const xmlChar **attributes);
+ const char **attributes);
/* svg_group.c */
@@ -529,15 +526,15 @@
svg_status_t
_svg_group_apply_svg_attributes (svg_group_t *group,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
_svg_group_apply_group_attributes (svg_group_t *group,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
_svg_group_apply_use_attributes (svg_element_t *group,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
_svg_group_get_size (svg_group_t *group, svg_length_t *width, svg_length_t *height);
@@ -556,7 +553,7 @@
svg_status_t
_svg_image_apply_attributes (svg_image_t *image,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
_svg_image_render (svg_image_t *image,
@@ -583,7 +580,7 @@
/* svg_paint.c */
svg_status_t
-_svg_paint_init (svg_paint_t *paint, svg_t *svg, const xmlChar *str);
+_svg_paint_init (svg_paint_t *paint, svg_t *svg, const char *str);
svg_status_t
_svg_paint_deinit (svg_paint_t *paint);
@@ -605,6 +602,20 @@
svg_status_t
_svg_parser_end (svg_parser_t *parser);
+void
+_svg_parser_sax_start_element (void *closure,
+ const xmlChar *name,
+ const xmlChar **atts);
+
+void
+_svg_parser_sax_end_element (void *closure,
+ const xmlChar *name);
+
+void
+_svg_parser_sax_characters (void *closure,
+ const xmlChar *ch,
+ int len);
+
/* svg_path.c */
svg_status_t
@@ -669,10 +680,10 @@
svg_status_t
_svg_path_apply_attributes (svg_path_t *path,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
-_svg_path_add_from_str (svg_path_t *path, const xmlChar *path_str);
+_svg_path_add_from_str (svg_path_t *path, const char *path_str);
svg_status_t
_svg_path_move_to (svg_path_t *path, double x, double y);
@@ -777,7 +788,7 @@
svg_status_t
_svg_pattern_apply_attributes (svg_pattern_t *pattern,
- const xmlChar **attributes);
+ const char **attributes);
svg_status_t
_svg_pattern_render (svg_element_t *pattern,
@@ -822,7 +833,7 @@
svg_status_t
_svg_style_apply_attributes (svg_style_t *style,
- const xmlChar **attributes);
+ const char **attributes);
double
_svg_style_get_opacity (svg_style_t *style);
@@ -847,7 +858,7 @@
svg_status_t
_svg_text_append_chars (svg_text_t *text,
- const xmlChar *chars,
+ const char *chars,
int len);
svg_status_t
@@ -857,7 +868,7 @@
svg_status_t
_svg_text_apply_attributes (svg_text_t *text,
- const xmlChar **attributes);
+ const char **attributes);
/* svg_transform.c */
@@ -940,6 +951,6 @@
svg_status_t
_svg_transform_apply_attributes (svg_transform_t *transform,
- const xmlChar **attributes);
+ const char **attributes);
#endif
More information about the cairo-commit
mailing list