[genius] Sun Apr 19 18:55:12 2009 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit 0e6316b1c5b460392d133c4cbd00c5e2d7177500
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Sun Apr 19 18:56:57 2009 -0500

    Sun Apr 19 18:55:12 2009  Jiri (George) Lebl <jirka 5z com>
    
    	* src/mpwrap.c: Fix conflict with changing precision and the mpfr
    	  cache.  Also fix a possible extra negation error in pow_z.
---
 ChangeLog    |    5 +++++
 src/mpwrap.c |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d6d4736..1772232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 19 18:55:12 2009  Jiri (George) Lebl <jirka 5z com>
+
+	* src/mpwrap.c: Fix conflict with changing precision and the mpfr
+	  cache.  Also fix a possible extra negation error in pow_z.
+
 Fri Apr 03 15:42:40 2009  Jiri (George) Lebl <jirka 5z com>
 
 	* src/graphing.c: joins and caps are round.  Fixes bad looking joins
diff --git a/src/mpwrap.c b/src/mpwrap.c
index 4a1aec6..54a3c60 100644
--- a/src/mpwrap.c
+++ b/src/mpwrap.c
@@ -109,11 +109,12 @@ static __mpfr_struct *free_mpfr_top = free_mpfr;
 		memcpy (THE_f, free_mpfr_top, sizeof (__mpfr_struct));	\
 	}
 #define CLEAR_FREE_MPF(THE_f)				\
-	if (free_mpfr_top == &free_mpfr[FREE_LIST_SIZE-1]) { \
+	if (free_mpfr_top == &free_mpfr[FREE_LIST_SIZE-1] || \
+	    mpfr_get_prec (THE_f) != default_mpfr_prec) { \
 		mpfr_clear (THE_f);			\
 	} else {					\
 		memcpy (free_mpfr_top, THE_f, sizeof (__mpfr_struct));	\
-		free_mpfr_top++;				\
+		free_mpfr_top++;			\
 	}
 
 #define MAKE_CPLX_OPS(THE_op,THE_r,THE_i) {		\
@@ -1971,7 +1972,7 @@ mpwl_pow_z(MpwRealNum *rop,MpwRealNum *op1,MpwRealNum *op2)
 			mpwl_pow_ui(rop,op1,mpz_get_ui(op2->data.ival),reverse);
 	}
 
-	if(reverse)
+	if(reverse && op2 != rop)
 		mpz_neg(op2->data.ival,op2->data.ival);
 }
 
@@ -3160,6 +3161,7 @@ void
 mpw_set_default_prec (unsigned long int prec)
 {
 	__mpfr_struct *p;
+
 	mpfr_set_default_prec (prec);
 
 	/* whack the mpf cache */
@@ -5462,6 +5464,8 @@ mpw_im(mpw_ptr rop, mpw_ptr op)
 	if (rop == op) {
 		MAKE_IMAG(rop);
 		rop->r = rop->i;
+		/* Note that rop->r is set to gel_zero
+		   and it is allocated in MAKE_IMAG */
 		rop->i = gel_zero;
 		return;
 	}