diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-06-14 17:41:58 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-06-14 17:41:58 +0000 |
| commit | 696f29f5304ee453e80ef465ea48a399799c603f (patch) | |
| tree | 96d4954fcd49e0c2392bd95cb5da8ec924de0869 /graphics | |
| parent | 594f8ea99aa3d7921063c57f85e39c3821c75b35 (diff) | |
| download | pkgsrc-696f29f5304ee453e80ef465ea48a399799c603f.tar.gz | |
gimp: Avoid ambiguous function call.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gimp/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo index f652a7fc3be..4d582600bb5 100644 --- a/graphics/gimp/distinfo +++ b/graphics/gimp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.92 2018/05/27 13:46:45 wiz Exp $ +$NetBSD: distinfo,v 1.93 2018/06/14 17:41:58 jperkin Exp $ SHA1 (gimp-2.10.2.tar.bz2) = 97aae35f11675af7a055c8cb2073db72d88b7b88 RMD160 (gimp-2.10.2.tar.bz2) = b095eedc575120714aeb28f5453b75cdacb6cd77 @@ -6,5 +6,6 @@ SHA512 (gimp-2.10.2.tar.bz2) = 6e351294e018a9f879993700355bdf5f10bccc6862604ae19 Size (gimp-2.10.2.tar.bz2) = 30863771 bytes SHA1 (patch-aa) = 403c46d7070de208769e99e512922ba3a5b7129b SHA1 (patch-ab) = 37820b9e03702248294f0030ffbd09e7f14f3dcb +SHA1 (patch-app_core_gimpbrush-transform.cc) = 2524948ed5b04ab2b50f169f5dfd5eba4aac4395 SHA1 (patch-plug-ins_common_file-mng.c) = 8ed244997cdef7125e1aa5da4d0fac5068ad5159 SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = c424b1a8e345ec3d0763ac2cf1f8535da9e10797 diff --git a/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc b/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc new file mode 100644 index 00000000000..2b377374eb4 --- /dev/null +++ b/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc @@ -0,0 +1,42 @@ +$NetBSD: patch-app_core_gimpbrush-transform.cc,v 1.1 2018/06/14 17:41:58 jperkin Exp $ + +Avoid ambiguous function call. + +--- app/core/gimpbrush-transform.cc.orig 2018-04-26 13:26:41.000000000 +0000 ++++ app/core/gimpbrush-transform.cc +@@ -147,7 +147,7 @@ gimp_brush_real_transform_mask (GimpBrus + * rectangle. + */ + const gint fraction_bits = 12; +- const gint int_multiple = pow (2, fraction_bits); ++ const gint int_multiple = pow ((double)2, fraction_bits); + + /* In inner loop's bilinear calculation, two numbers that were each + * previously multiplied by int_multiple are multiplied together. +@@ -169,7 +169,7 @@ gimp_brush_real_transform_mask (GimpBrus + * 2^9 = 0010 0000 0000 + * 2^9 - 1 = 0001 1111 1111 + */ +- const guint fraction_bitmask = pow(2, fraction_bits) - 1 ; ++ const guint fraction_bitmask = pow((double)2, fraction_bits) - 1 ; + + source = gimp_brush_get_mask (brush); + +@@ -447,7 +447,7 @@ gimp_brush_real_transform_pixmap (GimpBr + * rectangle. + */ + const gint fraction_bits = 12; +- const gint int_multiple = pow (2, fraction_bits); ++ const gint int_multiple = pow ((double)2, fraction_bits); + + /* In inner loop's bilinear calculation, two numbers that were each + * previously multiplied by int_multiple are multiplied together. +@@ -469,7 +469,7 @@ gimp_brush_real_transform_pixmap (GimpBr + * 2^9 = 0010 0000 0000 + * 2^9 - 1 = 0001 1111 1111 + */ +- const guint fraction_bitmask = pow(2, fraction_bits) - 1 ; ++ const guint fraction_bitmask = pow((double)2, fraction_bits) - 1 ; + + source = gimp_brush_get_pixmap (brush); + |