evas: remove librsvg svg loader.

NOTE: as librsvg is a massive source of bugs in e17, it is now
removed from evas. You can still use librsvg by using the
evas_generic_loader. Please not that you need to properly delete
it from your disk if you don't use a package manager. The file to
remove :
/*/lib/evas/modules/loaders/svg/linux-gnu-i686-1.2.*/module.so

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@71223 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index cddbb9b..88a7612 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -737,13 +737,18 @@
         * Fix pixman rendering support if you set alpha flag AFTER
         setting image size for custom image data.
 
-2012-05-14 Sanghee Park
+2012-05-14  Sanghee Park
 
        * Add Multisample Anti-Anliased surface format for Evas GL.
         The formats are divided into High, Med, Low, None, where High represent
         max number of samples.  Currently, this feature is only supported in GLES2
         environment with GL_IMG_multisampled_render_to_texture extension supported.
 
-2012-05-16 Vincent Torri
+2012-05-16  Vincent Torri
 
        * Use Esvg for svg rendering. If not found, librsvg is still used.
+
+2012-05-18  Cedric Bail
+
+       * Remove librsvg svg loader as it is a massive source of crash in e17. If
+       you still want to use it, use the evas_generic_loader librsvg binary.

diff --git a/NEWS b/NEWS
index c2f50ea..bbc210d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Fixes:
 
 Removal:
    * Remove EVAS_FRAME_QUEUING, EVAS_SLI, METRIC_CACHE and WORD_CACHE.
+   * Remove librsvg svg loader (If you want to use it, use the evas_generic_loader variant).
 
 Evas 1.2.0
 

diff --git a/m4/evas_check_loader.m4 b/m4/evas_check_loader.m4
index ea50157..c8c5248 100644 (file)
--- a/m4/evas_check_loader.m4
+++ b/m4/evas_check_loader.m4
@@ -237,13 +237,6 @@ PKG_CHECK_MODULES([SVG],
    [have_dep="yes" have_esvg="yes" requirement="esvg"],
    [have_dep="no"])
 
-if test "x${have_dep}" = "xno" ; then
-   PKG_CHECK_MODULES([SVG],
-      [librsvg-2.0 >= 2.14.0 cairo >= 1.0.0],
-      [have_dep="yes" requirement="librsvg-2.0 cairo"],
-      [have_dep="no"])
-fi
-
 if test "x${have_dep}" = "xyes" ; then
    evas_image_loader_[]$1[]_cflags="${SVG_CFLAGS}"
    evas_image_loader_[]$1[]_libs="${SVG_LIBS}"
@@ -256,8 +249,6 @@ if test "x$2" = "xstatic" ; then
    requirement_evas="${requirement} ${requirement_evas}"
 fi
 
-AM_CONDITIONAL(BUILD_LOADER_SVG_ESVG, [test "x${have_esvg}" = "xyes"])
-
 if test "x${have_dep}" = "xyes" ; then
   m4_default([$3], [:])
 else

diff --git a/src/modules/loaders/svg/Makefile.am b/src/modules/loaders/svg/Makefile.am
index 2b47de3..efb3e46 100644 (file)
--- a/src/modules/loaders/svg/Makefile.am
+++ b/src/modules/loaders/svg/Makefile.am
@@ -17,11 +17,7 @@ if !EVAS_STATIC_BUILD_SVG
 pkgdir = $(libdir)/evas/modules/loaders/svg/$(MODULE_ARCH)
 pkg_LTLIBRARIES = module.la
 
-if BUILD_LOADER_SVG_ESVG
 module_la_SOURCES = evas_image_load_esvg.c
-else
-module_la_SOURCES = evas_image_load_rsvg.c
-endif
 
 module_la_LIBADD = @EINA_LIBS@ @evas_image_loader_svg_libs@ $(top_builddir)/src/lib/libevas.la
 module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
@@ -30,11 +26,7 @@ module_la_LIBTOOLFLAGS = --tag=disable-static
 else
 
 noinst_LTLIBRARIES = libevas_loader_svg.la
-if BUILD_LOADER_SVG_ESVG
 libevas_loader_svg_la_SOURCES = evas_image_load_esvg.c
-else
-libevas_loader_svg_la_SOURCES = evas_image_load_rsvg.c
-endif
 libevas_loader_svg_la_LIBADD = @evas_image_loader_svg_libs@
 
 endif

diff --git a/src/modules/loaders/svg/evas_image_load_rsvg.c b/src/modules/loaders/svg/evas_image_load_rsvg.c
deleted file mode 100644 (file)
index dc0fc8d..0000000
--- a/src/modules/loaders/svg/evas_image_load_rsvg.c
+++ /dev/null
@@ -1,281 +0,0 @@
-#include "evas_common.h"
-#include "evas_private.h"
-
-#include <librsvg/rsvg.h>
-#include <librsvg/rsvg-cairo.h>
-
-static inline Eina_Bool evas_image_load_file_is_svg(const char *file) EINA_ARG_NONNULL(1) EINA_PURE;
-static Eina_Bool evas_image_load_file_head_svg(Image_Entry *ie, const char *file, const char *key, int *error) EINA_ARG_NONNULL(1, 2, 4);
-static Eina_Bool evas_image_load_file_data_svg(Image_Entry *ie, const char *file, const char *key, int *error) EINA_ARG_NONNULL(1, 2, 4);
-
-Evas_Image_Load_Func evas_image_load_svg_func =
-{
-  EINA_FALSE,
-  evas_image_load_file_head_svg,
-  evas_image_load_file_data_svg,
-  NULL,
-  EINA_FALSE
-};
-
-static int  rsvg_initialized = 0;
-
-
-static inline Eina_Bool evas_image_load_file_is_svg(const char *file)
-{
-   int i, len = strlen(file);
-   Eina_Bool is_gz = EINA_FALSE;
-
-   for (i = len - 1; i > 0; i--)
-     {
-       if (file[i] == '.')
-         {
-            if (is_gz)
-              break;
-            else if (strcasecmp(file + i + 1, "gz") == 0)
-              is_gz = EINA_TRUE;
-            else
-              break;
-         }
-     }
-
-   if (i < 1) return EINA_FALSE;
-   i++;
-   if (i >= len) return EINA_FALSE;
-   if (strncasecmp(file + i, "svg", 3) != 0) return EINA_FALSE;
-   i += 3;
-   if (is_gz)
-     {
-       if (file[i] == '.') return EINA_TRUE;
-       else return EINA_FALSE;
-     }
-   else
-     {
-       if (file[i] == '\0') return EINA_TRUE;
-       else if (((file[i] == 'z') || (file[i] == 'Z')) && (!file[i + 1])) return EINA_TRUE;
-       else return EINA_FALSE;
-     }
-}
-
-static Eina_Bool
-evas_image_load_file_head_svg(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error)
-{
-   RsvgHandle         *rsvg;
-   RsvgDimensionData   dim;
-   int                 w, h;
-
-   /* ignore all files not called .svg or .svg.gz - because rsvg has a leak
-    * where closing the handle doesn't free mem */
-   if (!evas_image_load_file_is_svg(file))
-     {
-       *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
-       return EINA_FALSE;
-     }
-
-   rsvg = rsvg_handle_new_from_file(file, NULL);
-   if (!rsvg)
-     {
-       *error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
-       return EINA_FALSE;
-     }
-
-   rsvg_handle_set_dpi(rsvg, 75.0);
-   rsvg_handle_get_dimensions(rsvg, &dim);
-   w = dim.width;
-   h = dim.height;
-   if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE) ||
-       IMG_TOO_BIG(w, h))
-     {
-       rsvg_handle_close(rsvg, NULL);
-       g_object_unref(rsvg);
-       if (IMG_TOO_BIG(w, h))
-         *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       else
-         *error = EVAS_LOAD_ERROR_GENERIC;
-       return EINA_FALSE;
-     }
-   if (ie->load_opts.scale_down_by > 1)
-     {
-       w /= ie->load_opts.scale_down_by;
-       h /= ie->load_opts.scale_down_by;
-     }
-   else if (ie->load_opts.dpi > 0.0)
-     {
-       w = (w * ie->load_opts.dpi) / 75.0;
-       h = (h * ie->load_opts.dpi) / 75.0;
-     }
-   else if ((ie->load_opts.w > 0) &&
-           (ie->load_opts.h > 0))
-     {
-       unsigned int w2, h2;
-       
-       w2 = ie->load_opts.w;
-       h2 = (ie->load_opts.w * h) / w;
-       if (h2 > ie->load_opts.h)
-         {
-            h2 = ie->load_opts.h;
-            w2 = (ie->load_opts.h * w) / h;
-         }
-       w = w2;
-       h = h2;
-     }
-   if (w < 1) w = 1;
-   if (h < 1) h = 1;
-   ie->w = w;
-   ie->h = h;
-   ie->flags.alpha = 1;
-   rsvg_handle_close(rsvg, NULL);
-   g_object_unref(rsvg);
-
-   *error = EVAS_LOAD_ERROR_NONE;
-   return EINA_TRUE;
-}
-
-/** FIXME: All evas loaders need to be tightened up **/
-static Eina_Bool
-evas_image_load_file_data_svg(Image_Entry *ie, const char *file, const char *key __UNUSED__, int *error)
-{
-   DATA32             *pixels;
-   RsvgHandle         *rsvg;
-   RsvgDimensionData   dim;
-   int                 w, h;
-   cairo_surface_t    *surface;
-   cairo_t            *cr;
-
-   /* ignore all files not called .svg or .svg.gz - because rsvg has a leak
-    * where closing the handle doesn't free mem */
-   if (!evas_image_load_file_is_svg(file))
-     {
-       *error = EVAS_LOAD_ERROR_UNKNOWN_FORMAT;
-       return EINA_FALSE;
-     }
-
-   rsvg = rsvg_handle_new_from_file(file, NULL);
-   if (!rsvg)
-     {
-       *error = EVAS_LOAD_ERROR_DOES_NOT_EXIST;
-       return EINA_FALSE;
-     }
-
-   rsvg_handle_set_dpi(rsvg, 75.0);
-   rsvg_handle_get_dimensions(rsvg, &dim);
-   w = dim.width;
-   h = dim.height;
-   if ((w < 1) || (h < 1) || (w > IMG_MAX_SIZE) || (h > IMG_MAX_SIZE))
-     {
-       rsvg_handle_close(rsvg, NULL);
-       g_object_unref(rsvg);
-       if (IMG_TOO_BIG(w, h))
-         *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       else
-         *error = EVAS_LOAD_ERROR_GENERIC;
-       return EINA_FALSE;
-     }
-   if (ie->load_opts.scale_down_by > 1)
-     {
-       w /= ie->load_opts.scale_down_by;
-       h /= ie->load_opts.scale_down_by;
-     }
-   else if (ie->load_opts.dpi > 0.0)
-     {
-       w = (w * ie->load_opts.dpi) / 75.0;
-       h = (h * ie->load_opts.dpi) / 75.0;
-     }
-   else if ((ie->load_opts.w > 0) &&
-           (ie->load_opts.h > 0))
-     {
-       unsigned int w2, h2;
-       
-       w2 = ie->load_opts.w;
-       h2 = (ie->load_opts.w * h) / w;
-       if (h2 > ie->load_opts.h)
-         {
-            h2 = ie->load_opts.h;
-            w2 = (ie->load_opts.h * w) / h;
-         }
-       w = w2;
-       h = h2;
-     }
-   if (w < 1) w = 1;
-   if (h < 1) h = 1;
-   if ((w != (int)ie->w) || (h != (int)ie->h))
-     {
-        *error = EVAS_LOAD_ERROR_GENERIC;
-        goto error;
-     }
-   ie->flags.alpha = 1;
-   evas_cache_image_surface_alloc(ie, w, h);
-   pixels = evas_cache_image_pixels(ie);
-   if (!pixels)
-     {
-       *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       goto error;
-     }
-
-   memset(pixels, 0, w * h * sizeof(DATA32));
-   surface = cairo_image_surface_create_for_data((unsigned char *)pixels, CAIRO_FORMAT_ARGB32,
-                                                w, h, w * sizeof(DATA32));
-   if (!surface)
-     {
-       *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       goto error;
-     }
-   cr = cairo_create(surface);
-   if (!cr)
-     {
-       cairo_surface_destroy(surface);
-       *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
-       goto error;
-     }
-
-   cairo_scale(cr,
-              (double)ie->w / dim.em,
-              (double)ie->h / dim.ex);
-   rsvg_handle_render_cairo(rsvg, cr);
-   cairo_surface_destroy(surface);
-   /* need to check if this is required... */
-   cairo_destroy(cr);
-   rsvg_handle_close(rsvg, NULL);
-   g_object_unref(rsvg);
-   evas_common_image_set_alpha_sparse(ie);
-   return EINA_TRUE;
-
- error:
-   rsvg_handle_close(rsvg, NULL);
-   g_object_unref(rsvg);
-   return EINA_FALSE;
-}
-
-static int
-module_open(Evas_Module *em)
-{
-   if (!em) return 0;
-   em->functions = (void *)(&evas_image_load_svg_func);
-   if (!rsvg_initialized) rsvg_init();
-   rsvg_initialized = 1;
-   return 1;
-}
-
-static void
-module_close(Evas_Module *em __UNUSED__)
-{
-   if (!rsvg_initialized) return;
-   //rsvg_term();
-   //rsvg_initialized = 0;
-}
-
-static Evas_Module_Api evas_modapi =
-{
-   EVAS_MODULE_API_VERSION,
-   "svg",
-   "none",
-   {
-     module_open,
-     module_close
-   }
-};
-
-EVAS_MODULE_DEFINE(EVAS_MODULE_TYPE_IMAGE_LOADER, image_loader, svg);
-
-#ifndef EVAS_STATIC_BUILD_SVG
-EVAS_EINA_MODULE_DEFINE(image_loader, svg);
-#endif