summaryrefslogtreecommitdiff
path: root/src/image.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-12-18 13:16:16 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2014-12-18 13:16:41 -0800
commitd8183f8fef11d654d0aae2b24eddcdfad6d63164 (patch)
treeb997cc5645e2bee58ee895612183886100873bef /src/image.c
parent22e37afd18bd35d5ecd41189232aa2281d1d1bf5 (diff)
downloademacs-d8183f8fef11d654d0aae2b24eddcdfad6d63164.tar.gz
* image.c (svg_load): Fix pointer signedness.
Diffstat (limited to 'src/image.c')
-rw-r--r--src/image.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c
index ceec3ce46b1..a73a7251753 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8601,7 +8601,7 @@ static bool svg_image_p (Lisp_Object object);
static bool svg_load (struct frame *f, struct image *img);
static bool svg_load_image (struct frame *, struct image *,
- unsigned char *, ptrdiff_t, char*);
+ unsigned char *, ptrdiff_t, char *);
/* The symbol `svg' identifying images of this type. */
@@ -8807,7 +8807,7 @@ svg_load (struct frame *f, struct image *img)
return 0;
}
/* If the file was slurped into memory properly, parse it. */
- success_p = svg_load_image (f, img, contents, size, SSDATA(file));
+ success_p = svg_load_image (f, img, contents, size, SSDATA (file));
xfree (contents);
}
/* Else its not a file, its a lisp object. Load the image from a
@@ -8824,8 +8824,8 @@ svg_load (struct frame *f, struct image *img)
}
original_filename = BVAR (current_buffer, filename);
success_p = svg_load_image (f, img, SDATA (data), SBYTES (data),
- NILP(original_filename) ?
- NULL : SDATA(original_filename));
+ (NILP (original_filename) ? NULL
+ : SSDATA (original_filename)));
}
return success_p;
@@ -8843,7 +8843,7 @@ svg_load_image (struct frame *f, /* Pointer to emacs frame structure. *
struct image *img, /* Pointer to emacs image structure. */
unsigned char *contents, /* String containing the SVG XML data to be parsed. */
ptrdiff_t size, /* Size of data in bytes. */
- char *filename) /* Name of SVG file being loaded. */
+ char *filename) /* Name of SVG file being loaded. */
{
RsvgHandle *rsvg_handle;
RsvgDimensionData dimension_data;