[EGIT] [core/efl] master 01/01: Ensure we check for the correct minimum rsvg version for rsvg_handle_get_intrinsic_size_in_pixels

[Joshua Strobl]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ec527a9026a78ee57ccaff42a46554e6cc39574e

commit ec527a9026a78ee57ccaff42a46554e6cc39574e
Author: Joshua Strobl <jos...@streambits.io>
Date:   Wed Sep 22 15:56:01 2021 +0000

    Ensure we check for the correct minimum rsvg version for 
rsvg_handle_get_intrinsic_size_in_pixels
    
    In commit cbcf5bc64a90306c82f0eb99ae43b5f52c122f71, newer librsvg APIs were 
used that are not available in versions between 2.36.0 and 2.50.0, e.g. 
rsvg_handle_get_intrinsic_size_in_pixels which was included in 2.51.x.
    
    This has been resolved by adding a HAVE_SVG_2_51 and using it for both 
rsvg_handle_get_intrinsic_size_in_pixels and rsvg_handle_render_document, 
though the later technically landed in 2.46.0.
    
    Reviewed-by: Christopher Michael <devilho...@comcast.net>
    Differential Revision: https://phab.enlightenment.org/D12293
---
 src/generic/evas/rsvg/main.c      | 4 ++--
 src/generic/evas/rsvg/meson.build | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/generic/evas/rsvg/main.c b/src/generic/evas/rsvg/main.c
index 309539ccd2..e6389b7afc 100644
--- a/src/generic/evas/rsvg/main.c
+++ b/src/generic/evas/rsvg/main.c
@@ -99,7 +99,7 @@ read_svg_header(int scale_down, double dpi, int size_w, int 
size_h)
 {
    rsvg_handle_set_dpi(rsvg, 75.0);
 
-#ifndef HAVE_SVG_2_36
+#ifndef HAVE_SVG_2_51
    rsvg_handle_get_dimensions(rsvg, &dim);
    width = dim.width;
    height = dim.height;
@@ -162,7 +162,7 @@ read_svg_data(void)
 
    cairo_scale(cr, (double) width / dim.em, (double) height / dim.ex);
 
-#ifndef HAVE_SVG_2_36
+#ifndef HAVE_SVG_2_51
    rsvg_handle_render_cairo(rsvg, cr);
 #else
    RsvgRectangle vp =
diff --git a/src/generic/evas/rsvg/meson.build 
b/src/generic/evas/rsvg/meson.build
index a0c5ea12ce..64ae1a2edd 100644
--- a/src/generic/evas/rsvg/meson.build
+++ b/src/generic/evas/rsvg/meson.build
@@ -8,5 +8,10 @@ if rsvg.version() >= '2.36.0'
   config_h.set('HAVE_SVG_2_36', '1')
 endif
 
+# Needed for rsvg_handle_get_intrinsic_size_in_pixels
+if rsvg.version() >= '2.51.0'
+  config_h.set('HAVE_SVG_2_51', '1')
+endif
+
 generic_deps = [rsvg]
 generic_support = ['svg', 'svgz', 'svg.gz']

--