Evas: update to newer esvg API

Should I backport that ?

SVN revision: 77019

diff --git a/legacy/evas/m4/evas_check_loader.m4 b/legacy/evas/m4/evas_check_loader.m4
index 0130484..3dacfb8 100644 (file)
--- a/legacy/evas/m4/evas_check_loader.m4
+++ b/legacy/evas/m4/evas_check_loader.m4
@@ -231,10 +231,12 @@ requirement=""
 have_esvg="no"
 evas_image_loader_[]$1[]_cflags=""
 evas_image_loader_[]$1[]_libs=""
+version_esvg="0.0.17"
+version_ender="0.0.6"
 
 PKG_CHECK_MODULES([SVG],
-   [esvg >= 0.0.16 ender >= 0.0.6],
-   [have_dep="yes" have_esvg="yes" requirement="esvg >= 0.0.16 ender >= 0.0.6"],
+   [esvg >= ${version_esvg} ender >= ${version_ender}],
+   [have_dep="yes" have_esvg="yes" requirement="esvg >= ${version_esvg} ender >= ${version_ender}"],
    [have_dep="no"])
 
 if test "x${have_dep}" = "xyes" ; then

diff --git a/legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c b/legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c
index b73cf06..6205b07 100644 (file)
--- a/legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c
+++ b/legacy/evas/src/modules/loaders/svg/evas_image_load_esvg.c
@@ -87,8 +87,8 @@ evas_image_load_file_head_svg(Image_Entry *ie, const char *file, const char *key
         return EINA_FALSE;
      }
 
-   esvg_renderable_x_dpi_set(e, 92.0);
-   esvg_renderable_y_dpi_set(e, 92.0);
+   esvg_svg_x_dpi_set(e, 92.0);
+   esvg_svg_y_dpi_set(e, 92.0);
    esvg_svg_actual_width_get(e, &sw);
    esvg_svg_actual_height_get(e, &sh);
    w = (int)ceil(sw);
@@ -166,8 +166,8 @@ evas_image_load_file_data_svg(Image_Entry *ie, const char *file, const char *key
         return EINA_FALSE;
      }
 
-   esvg_renderable_x_dpi_set(e, 75.0);
-   esvg_renderable_y_dpi_set(e, 75.0);
+   esvg_svg_x_dpi_set(e, 92.0);
+   esvg_svg_y_dpi_set(e, 92.0);
    esvg_svg_actual_width_get(e, &sw);
    esvg_svg_actual_height_get(e, &sh);
    w = (int)ceil(sw);
@@ -231,9 +231,9 @@ evas_image_load_file_data_svg(Image_Entry *ie, const char *file, const char *key
         goto unref_renderer;
      }
 
-   esvg_element_setup(e, NULL);
+   esvg_svg_setup(e, NULL);
 
-   if (!esvg_renderable_draw(e, s, NULL, 0, 0, &err))
+   if (!esvg_svg_draw(e, s, NULL, 0, 0, &err))
      {
         *error = EVAS_LOAD_ERROR_GENERIC;
         enesim_error_dump(err);