CVS commit: pkgsrc/graphics/gimp

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Jun 14 17:41:58 UTC 2018

Modified Files:
        pkgsrc/graphics/gimp: distinfo
Added Files:
        pkgsrc/graphics/gimp/patches: patch-app_core_gimpbrush-transform.cc

Log Message:
gimp: Avoid ambiguous function call.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/graphics/gimp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gimp/distinfo
diff -u pkgsrc/graphics/gimp/distinfo:1.92 pkgsrc/graphics/gimp/distinfo:1.93
--- pkgsrc/graphics/gimp/distinfo:1.92  Sun May 27 13:46:45 2018
+++ pkgsrc/graphics/gimp/distinfo       Thu Jun 14 17:41:58 2018
@@ -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) = 6e351294e
 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

Added files:

Index: pkgsrc/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc
diff -u /dev/null pkgsrc/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc:1.1
--- /dev/null   Thu Jun 14 17:41:58 2018
+++ pkgsrc/graphics/gimp/patches/patch-app_core_gimpbrush-transform.cc  Thu Jun 14 17:41:58 2018
@@ -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);
+