Skip to content

Commit

Permalink
fix: rsvg_handle_get_dimensions deprecated, use rsvg_handle_get_intri…
Browse files Browse the repository at this point in the history
…nsic_size_in_pixels instead
  • Loading branch information
eyal0 committed Nov 4, 2021
1 parent 30183cb commit 82346c6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ PKG_CHECK_MODULES(RSVG_HANDLE_RENDER_DOCUMENT, librsvg-2.0 >= 2.46,
[AC_DEFINE(HAVE_RSVG_HANDLE_RENDER_DOCUMENT,1,[Define to 1 if your librsvg has rsvg_handle_render_document().])],
[:])

# 2.52 for rsvg_handle_get_intrinsic_size_in_pixels
PKG_CHECK_MODULES(RSVG_HANDLE_GET_INTRINSIC_SIZE_IN_PIXELS, librsvg-2.0 >= 2.52,
[AC_DEFINE(HAVE_RSVG_HANDLE_GET_INTRINSIC_SIZE_IN_PIXELS,1,[Define to 1 if your librsvg has rsvg_handle_get_intrinsic_size_in_pixels().])],
[:])

# Optional GEOS, as a faster and more reliable replacement for Boost geometry.
GEOS_INIT([3.8.1])
AS_IF([test "x$HAVE_GEOS" = "xyes"],
Expand Down
14 changes: 10 additions & 4 deletions gerberimporter_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,23 @@ void boost_bitmap_from_gerber(const multi_polygon_type_fp& polys, const box_type
&gerror);
Cairo::RefPtr<Cairo::Context> cr = Cairo::Context::create(cairo_surface);
#ifdef HAVE_RSVG_HANDLE_RENDER_DOCUMENT
RsvgDimensionData dimensions;
rsvg_handle_get_dimensions(rsvg_handle, &dimensions);
RsvgRectangle viewport;
viewport.x = 0;
viewport.y = 0;
#ifdef HAVE_RSVG_HANDLE_GET_INTRINSIC_SIZE_IN_PIXELS
rsvg_handle_set_dpi(rsvg_handle, 96);
BOOST_REQUIRE(rsvg_handle_get_intrinsic_size_in_pixels(
rsvg_handle, &viewport.width, &viewport.height));
#else // !HAVE_RSVG_HANDLE_GET_INTRINSIC_SIZE_IN_PIXELS
RsvgDimensionData dimensions;
rsvg_handle_get_dimensions(rsvg_handle, &dimensions);
viewport.width = dimensions.width;
viewport.height = dimensions.height;
#endif
BOOST_REQUIRE(rsvg_handle_render_document(rsvg_handle, cr->cobj(), &viewport, nullptr));
#else /*!HAVE_RSVG_HANDLE_RENDER_DOCUMENT*/
#else // !HAVE_RSVG_HANDLE_RENDER_DOCUMENT
BOOST_REQUIRE(rsvg_handle_render_cairo(rsvg_handle, cr->cobj()));
#endif
#endif // HAVE_RSVG_HANDLE_RENDER_DOCUMENT
g_object_unref(rsvg_handle);
}

Expand Down

0 comments on commit 82346c6

Please sign in to comment.