8ba8b562e4
- This fixes conversion of 24 bpp windows icons (bz 440136)
- Don't reuse GError structs, that upsets glib2 (bz 325211)
- Use the system ltdl, not the included copy (bz 237475)
- Fix various multilib conflicts (bz 341561)
- Use xdg-open instead of htmlview (bz 388451)
- Some small specfile cleanups (utf-8 stuff & others) fixing rpmlint
warnings
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
diff -up ImageMagick-6.4.0/coders/svg.c~ ImageMagick-6.4.0/coders/svg.c
|
|
--- ImageMagick-6.4.0/coders/svg.c~ 2008-04-26 11:32:26.000000000 +0200
|
|
+++ ImageMagick-6.4.0/coders/svg.c 2008-04-26 11:32:26.000000000 +0200
|
|
@@ -2777,12 +2777,20 @@ static Image *ReadSVGImage(const ImageIn
|
|
rsvg_handle_set_dpi_x_y(svg_info,
|
|
image->x_resolution == 0.0 ? 72.0 : image->x_resolution,
|
|
image->y_resolution == 0.0 ? 72.0 : image->y_resolution);
|
|
- error=(GError *) NULL;
|
|
- while ((n=ReadBlob(image,MaxTextExtent,message)) != 0)
|
|
+ while ((n=ReadBlob(image,MaxTextExtent,message)) != 0) {
|
|
+ error=(GError *) NULL;
|
|
(void) rsvg_handle_write(svg_info,message,n,&error);
|
|
+ if (error != (GError *) NULL) {
|
|
+ /* FIXME actually do something with the error */
|
|
+ g_error_free(error);
|
|
+ }
|
|
+ }
|
|
+ error=(GError *) NULL;
|
|
rsvg_handle_close(svg_info,&error);
|
|
- if (error != (GError *) NULL)
|
|
+ if (error != (GError *) NULL) {
|
|
+ /* FIXME actually do something with the error */
|
|
g_error_free(error);
|
|
+ }
|
|
#if defined(MAGICKCORE_CAIRO_DELEGATE)
|
|
rsvg_handle_get_dimensions(svg_info,&dimension_info);
|
|
image->columns=dimension_info.width*image->x_resolution/72.0;
|