-#include <fcntl.h> /* open */
-#include <stdio.h> /* printf, fprintf */
+#include <stdio.h> /* fopen, fprintf, fread, printf */
#include <stdlib.h> /* malloc */
-#include <sys/stat.h> /* fstat */
-#include <unistd.h> /* read */
#include <cairo.h>
#include <gdk/gdk.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <svgtiny.h>
+/*
+ * The width and height of the viewport that we'll render the SVG
+ * into. The final "picture" may not actually be this size; based on
+ * the height, width, viewBox, and preserveAspectRatio attributes in
+ * the SVG itself, libsvgtiny may scale, stretch, offset, etc. the
+ * paths to make them fit nicely into the viewport.
+ */
+#define VIEWPORT_WIDTH 512
+#define VIEWPORT_HEIGHT 512
+
/* Convenient typedefs for libsvgtiny */
typedef struct svgtiny_diagram diagram_t;
+typedef struct svgtiny_shape shape_t;
/**
- * Render an svgtiny path using cairo.
+ * @brief Render an svgtiny path using cairo.
+ *
+ * @param cr
+ * A pointer to a valid cairo context.
+ *
+ * @param path
+ * A pointer to an svgtiny shape that will be rendered on the
+ * cairo context's target surface.
*/
-void render_path(cairo_t *cr, struct svgtiny_shape *path) {
+static void render_path(cairo_t* cr, shape_t* path) {
unsigned int j;
cairo_new_path(cr);
}
}
if (path->fill != svgtiny_TRANSPARENT) {
- cairo_set_source_rgb(cr,
- svgtiny_RED(path->fill) / 255.0,
- svgtiny_GREEN(path->fill) / 255.0,
- svgtiny_BLUE(path->fill) / 255.0);
+ cairo_set_source_rgba(cr,
+ svgtiny_RED(path->fill) / 255.0,
+ svgtiny_GREEN(path->fill) / 255.0,
+ svgtiny_BLUE(path->fill) / 255.0,
+ 1);
cairo_fill_preserve(cr);
}
if (path->stroke != svgtiny_TRANSPARENT) {
- cairo_set_source_rgb(cr,
- svgtiny_RED(path->stroke) / 255.0,
- svgtiny_GREEN(path->stroke) / 255.0,
- svgtiny_BLUE(path->stroke) / 255.0);
+ cairo_set_source_rgba(cr,
+ svgtiny_RED(path->stroke) / 255.0,
+ svgtiny_GREEN(path->stroke) / 255.0,
+ svgtiny_BLUE(path->stroke) / 255.0,
+ 1);
cairo_set_line_width(cr, path->stroke_width);
cairo_stroke_preserve(cr);
}
}
-/*
+/**
* @brief Parse an SVG file into a diagram_t structure.
*
- * @param path
- * The path to the SVG file.
+ * @param fp
+ * A pointer to an open file stream.
*
* @return If successful, a pointer to a @c diagram_t structure is
* returned; if not, @c NULL is returned. You are expected to @c
* svgtiny_free the result if it is valid.
*/
-diagram_t* svgtiny_diagram_from_path(char* path, int width, int height) {
- diagram_t *diagram;
+static diagram_t* svgtiny_diagram_from_file(FILE* fp, int width, int height) {
+ diagram_t* diagram;
- int fd;
size_t bytecount;
- char *buffer;
+ char* buffer;
size_t bytesread;
- struct stat sb;
svgtiny_code code;
- /* load file into memory buffer */
- fd = open(path, O_RDONLY);
- if (fd == -1) {
- perror(path);
- return NULL;
- }
-
- if (fstat(fd, &sb)) {
- perror(path);
- return NULL;
- }
- bytecount = sb.st_size;
+ /* Find the size of the file stream */
+ fseek(fp, 0L, SEEK_END);
+ bytecount = ftell(fp);
+ rewind(fp);
buffer = malloc(bytecount);
if (!buffer) {
return NULL;
}
- bytesread = read(fd, buffer, bytecount);
+ bytesread = fread(buffer, 1, bytecount, fp);
if (bytesread != bytecount) {
- perror(path);
- return NULL;
+ fprintf(stderr, "Read only %zd of %zd bytes from stream\n",
+ bytesread,
+ bytecount);
}
- close(fd);
+ fclose(fp);
-
- /* create svgtiny object */
diagram = svgtiny_create();
if (!diagram) {
fprintf(stderr, "svgtiny_create() failed\n");
return NULL;
}
- code = svgtiny_parse(diagram, buffer, bytecount, path, width, height);
+ code = svgtiny_parse(diagram, buffer, bytecount, "", width, height);
free(buffer);
if (code != svgtiny_OK) {
return diagram;
}
-/*
+/**
* @brief Create a cairo context from a libsvgtiny diagram.
*
* @param diagram
* is returned; if not, @c NULL is returned. You are expected to @c
* cairo_destroy the result if it is valid.
*/
-cairo_t* cairo_context_from_diagram(diagram_t* diagram) {
+static cairo_t* cairo_context_from_diagram(diagram_t* diagram) {
cairo_t* cr;
cairo_surface_t* surface;
cairo_status_t crs;
unsigned int i;
- surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
+ surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
diagram->width,
diagram->height);
return NULL;
}
- cairo_set_source_rgb(cr, 1, 1, 1);
+ cairo_set_source_rgba(cr, 0, 0, 0, 0);
cairo_paint(cr);
/* Loop through the shapes in the diagram... */
if (diagram->shape[i].text) {
/* Figure out what color to use from the R/G/B components of the
shape's stroke. */
- cairo_set_source_rgb(cr,
- svgtiny_RED(diagram->shape[i].stroke) / 255.0,
- svgtiny_GREEN(diagram->shape[i].stroke) / 255.0,
- svgtiny_BLUE(diagram->shape[i].stroke) / 255.0);
+ cairo_set_source_rgba(cr,
+ svgtiny_RED(diagram->shape[i].stroke) / 255.0,
+ svgtiny_GREEN(diagram->shape[i].stroke) / 255.0,
+ svgtiny_BLUE(diagram->shape[i].stroke) / 255.0,
+ 1);
/* Then move to the actual position of the text within the
shape... */
cairo_move_to(cr,
int main(int argc, char** argv) {
char* svgpath;
char* pngpath;
- int pngwidth = 1024, pngheight = 1024;
+ FILE* fp;
diagram_t* diagram;
- cairo_t *cr = 0;
+ cairo_t* cr = 0;
GdkPixbuf* pb;
svgpath = argv[1];
pngpath = argv[2];
- diagram = svgtiny_diagram_from_path(svgpath, pngwidth, pngheight);
+ fp = fopen(svgpath, "rb");
+ if (!fp) {
+ perror(svgpath);
+ return 1;
+ }
+
+ diagram = svgtiny_diagram_from_file(fp, VIEWPORT_WIDTH, VIEWPORT_HEIGHT);
if (!diagram) {
return 1;
}
return 1;
}
+ /* We're using the viewport width and height and not the diagram
+ * width/height for the image. The diagram can be of a different
+ * size and aspect ratio than the viewport, and our main use case is
+ * for icons that are generally square and reasonably sized. If the
+ * diagram is "small," then we want to scale it up until it fits
+ * nicely in the viewport before rendering it. That's as opposed to
+ * rendering the image small, and letting GDK scale it up. Of course
+ * this reasoning makes the assumption that the viewport is usually
+ * larger than the diagram.
+ */
pb = gdk_pixbuf_get_from_surface(cairo_get_target(cr),
0,
0,
- pngwidth,
- pngheight);
+ VIEWPORT_WIDTH,
+ VIEWPORT_HEIGHT);
if (pb) {
return 0;
}
+
+
+static GdkPixbuf* gdk_pixbuf_from_svg_file_stream(FILE *fp, GError **error) {
+ diagram_t* diagram;
+ cairo_t* cr = 0;
+
+ GdkPixbuf* pb;
+
+ diagram = svgtiny_diagram_from_file(fp, VIEWPORT_WIDTH, VIEWPORT_HEIGHT);
+ if (!diagram) {
+ return NULL;
+ }
+
+ cr = cairo_context_from_diagram(diagram);
+ if (!cr) {
+ svgtiny_free(diagram);
+ return NULL;
+ }
+
+
+ /* We're using the viewport width and height and not the diagram
+ * width/height for the image. The diagram can be of a different
+ * size and aspect ratio than the viewport, and our main use case is
+ * for icons that are generally square and reasonably sized. If the
+ * diagram is "small," then we want to scale it up until it fits
+ * nicely in the viewport before rendering it. That's as opposed to
+ * rendering the image small, and letting GDK scale it up. Of course
+ * this reasoning makes the assumption that the viewport is usually
+ * larger than the diagram.
+ */
+ pb = gdk_pixbuf_get_from_surface(cairo_get_target(cr),
+ 0,
+ 0,
+ VIEWPORT_WIDTH,
+ VIEWPORT_HEIGHT);
+
+
+ if (!pb) {
+ fprintf(stderr, "gdk_pixbuf_get_from_surface failed!\n");
+ }
+
+ return pb;
+}
+
+
+G_MODULE_EXPORT void fill_vtable(GdkPixbufModule* module);
+void fill_vtable(GdkPixbufModule* module) {
+ module->load = gdk_pixbuf_from_svg_file_stream;
+}
+
+G_MODULE_EXPORT void fill_info(GdkPixbufFormat *info);
+void fill_info(GdkPixbufFormat* info) {
+ /* Borrowed from librsvg-2.40.21 */
+ static const GdkPixbufModulePattern signature[] = {
+ { " <svg", "* ", 100 },
+ { " <!DOCTYPE svg", "* ", 100 },
+ { NULL, NULL, 0 }
+ };
+
+ /* I'm not sure if we should support gzipped svg here? */
+ static const gchar *mime_types[] = {
+ "image/svg+xml",
+ "image/svg",
+ "image/svg-xml",
+ "image/vnd.adobe.svg+xml",
+ "text/xml-svg",
+ "image/svg+xml-compressed",
+ NULL
+ };
+
+ static const gchar *extensions[] = {
+ "svg",
+ "svgz",
+ "svg.gz",
+ NULL
+ };
+
+ info->name = "svg";
+ info->signature = (GdkPixbufModulePattern*) signature;
+ info->description = "Scalable Vector Graphics";
+ info->mime_types = (gchar**) mime_types;
+ info->extensions = (gchar**) extensions;
+ info->flags = GDK_PIXBUF_FORMAT_SCALABLE;
+ info->license = "AGPL3";
+}
+
projects / libsvgtiny-pixbuf.git / blobdiff