diff --git a/ChangeLog b/ChangeLog index eae9530c31..74e64163b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-10-31 Michael Natterer + + * configure.in: depend on glib 2.14.1 + + * app/tools/gimpdrawtool.c + * app/vectors/gimpvectors-import.c: use g_slice_dup() instead of + g_slice_new() and memcpy(). + 2007-10-31 Sven Neumann * plug-ins/common/retinex.c: use a combo-box instead of radio diff --git a/app/tools/gimpdrawtool.c b/app/tools/gimpdrawtool.c index e4569b3516..de00ceae2c 100644 --- a/app/tools/gimpdrawtool.c +++ b/app/tools/gimpdrawtool.c @@ -353,10 +353,7 @@ gimp_draw_tool_set_transform (GimpDrawTool *draw_tool, } if (transform) - { - draw_tool->transform = g_slice_new (GimpMatrix3); - memcpy (draw_tool->transform, transform, sizeof (GimpMatrix3)); - } + draw_tool->transform = g_slice_dup (GimpMatrix3, transform); gimp_draw_tool_resume (draw_tool); } diff --git a/app/vectors/gimpvectors-import.c b/app/vectors/gimpvectors-import.c index 93e3991add..3bfcb0b735 100644 --- a/app/vectors/gimpvectors-import.c +++ b/app/vectors/gimpvectors-import.c @@ -566,8 +566,7 @@ svg_handler_group_start (SvgHandler *handler, if (parse_svg_transform (*values, &matrix)) { - handler->transform = g_slice_new (GimpMatrix3); - memcpy (handler->transform, &matrix, sizeof (GimpMatrix3)); + handler->transform = g_slice_dup (GimpMatrix3, &matrix); #ifdef DEBUG_VECTORS_IMPORT g_printerr ("transform %s: %g %g %g %g %g %g %g %g %g\n", @@ -619,8 +618,7 @@ svg_handler_path_start (SvgHandler *handler, if (parse_svg_transform (*values, &matrix)) { - handler->transform = g_slice_new (GimpMatrix3); - memcpy (handler->transform, &matrix, sizeof (GimpMatrix3)); + handler->transform = g_slice_dup (GimpMatrix3, &matrix); } } break; @@ -702,8 +700,7 @@ svg_handler_rect_start (SvgHandler *handler, if (parse_svg_transform (*values, &matrix)) { - handler->transform = g_slice_new (GimpMatrix3); - memcpy (handler->transform, &matrix, sizeof (GimpMatrix3)); + handler->transform = g_slice_dup (GimpMatrix3, &matrix); } } break; @@ -853,8 +850,7 @@ svg_handler_ellipse_start (SvgHandler *handler, if (parse_svg_transform (*values, &matrix)) { - handler->transform = g_slice_new (GimpMatrix3); - memcpy (handler->transform, &matrix, sizeof (GimpMatrix3)); + handler->transform = g_slice_dup (GimpMatrix3, &matrix); } } break; @@ -922,8 +918,7 @@ svg_handler_line_start (SvgHandler *handler, if (parse_svg_transform (*values, &matrix)) { - handler->transform = g_slice_new (GimpMatrix3); - memcpy (handler->transform, &matrix, sizeof (GimpMatrix3)); + handler->transform = g_slice_dup (GimpMatrix3, &matrix); } } break; @@ -1011,8 +1006,7 @@ svg_handler_poly_start (SvgHandler *handler, if (parse_svg_transform (*values, &matrix)) { - handler->transform = g_slice_new (GimpMatrix3); - memcpy (handler->transform, &matrix, sizeof (GimpMatrix3)); + handler->transform = g_slice_dup (GimpMatrix3, &matrix); } } break; diff --git a/configure.in b/configure.in index 4b60b9a5c1..ad1d7a750b 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,7 @@ m4_define([gimp_stable], m4_define([gimp_full_name], [GNU Image Manipulation Program]) # required versions of other packages -m4_define([glib_required_version], [2.12.3]) +m4_define([glib_required_version], [2.14.1]) m4_define([gtk_required_version], [2.10.13]) m4_define([gdk_pixbuf_required_version], [gtk_required_version]) m4_define([pangoft2_required_version], [1.12.2])