}
}
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);
}
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,
return 1;
}
- /* We're using the diagram width and height and not the viewport
- * width/height for the image. This has the potential to create an
- * image with a different size and aspect ratio than the viewport,
- * but since our viewport is entirely made-up... I don't know. This
- * relies on libsvgtiny being good at scaling/stretching/etc an SVG
- * that may only have partial width/height/viewBox information.
+ /* 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,
- diagram->width,
- diagram->height);
+ 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