From a72a9a25915c097248b4bca41e6154830c926a69 Mon Sep 17 00:00:00 2001
From: Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Date: Mon, 28 Nov 2016 20:57:34 +0000
Subject: mplibdir: sync with the upstream

git-svn-id: svn://tug.org/texlive/trunk@42596 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/web2c/mplibdir/mp.w           | 6 ++++--
 Build/source/texk/web2c/mplibdir/mpmathbinary.w | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'Build')

diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index dcafaadd809..073f2920b5c 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -1,4 +1,4 @@
-% $Id: mp.w 2103 2016-11-25 13:03:37Z luigi $
+% $Id: mp.w 2104 2016-11-28 15:05:04Z luigi $
 %
 % This file is part of MetaPost;
 % the MetaPost program is in the public domain.
@@ -14810,6 +14810,8 @@ static mp_knot mp_make_envelope (MP mp, mp_knot c, mp_knot h, quarterword ljoin,
         set_number_from_addition (xtot, qx, w->x_coord);
         set_number_from_addition (ytot, qy, w->y_coord);
         q = mp_insert_knot (mp, q, xtot, ytot);
+ 	free_number (xtot);
+	free_number (ytot);
       }
     }
     if (q != mp_next_knot (p)) {
@@ -15075,7 +15077,7 @@ problems, so we just set |r:=NULL| in that case.
   take_fraction (ysub, tmp, dyout);
   set_number_from_addition(xtot, q->x_coord, xsub);
   set_number_from_addition(ytot, q->y_coord, ysub);
-  r = mp_insert_knot (mp, p, xtot, ytot);
+  r = mp_insert_knot (mp, r, xtot, ytot);
   free_number (xsub);
   free_number (ysub);
   free_number (xtot);
diff --git a/Build/source/texk/web2c/mplibdir/mpmathbinary.w b/Build/source/texk/web2c/mplibdir/mpmathbinary.w
index 287243c6d26..28537699196 100644
--- a/Build/source/texk/web2c/mplibdir/mpmathbinary.w
+++ b/Build/source/texk/web2c/mplibdir/mpmathbinary.w
@@ -920,7 +920,7 @@ void mp_wrapup_numeric_token(MP mp, unsigned char *start, unsigned char *stop) {
                "with that value; but it might be dangerous.",
                "(Set warningcheck:=0 to suppress this message.)",
                NULL };
-        mp_snprintf (msg, 256, "Number is too precise (%d vs. numberprecision = %f, required precision=%d bits vs internal precision=%f bits)", (unsigned int)lp,mpfr_get_d(internal_value (mp_number_precision).data.num, ROUNDING),lpbit,precision_bits);
+        mp_snprintf (msg, 256, "Number is too precise (%d vs. numberprecision = %f, required precision=%d bits vs internal precision=%f bits)", (unsigned int)lp,mpfr_get_d(internal_value (mp_number_precision).data.num, ROUNDING),(int)lpbit,precision_bits);
 @.Number is too large@>;
         mp_error (mp, msg, hlp, true);
       }
-- 
cgit v1.2.3