From 15119f0e10d93bfad5214e042ca437b86159b30f Mon Sep 17 00:00:00 2001
From: Thomas White <taw@bitwiz.org.uk>
Date: Fri, 22 Nov 2013 22:23:05 -0800
Subject: Use getcwd() instead of get_current_dir()

---
 src/process_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/process_image.c b/src/process_image.c
index 0e8eedbc..b07e16b6 100644
--- a/src/process_image.c
+++ b/src/process_image.c
@@ -146,7 +146,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs,
 	free(image.data);
 	image.data = data_for_measurement;
 
-	rn = get_current_dir_name();
+	rn = getcwd(NULL, 0);
 
 	r = chdir(tmpdir);
 	if ( r ) {
-- 
cgit v1.2.3


From 8683aef3880d17c64a10598ff9c2edd1532280cb Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Sat, 23 Nov 2013 08:55:58 +0100
Subject: get_hkl: Fix symmetric expansion

---
 src/get_hkl.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/get_hkl.c b/src/get_hkl.c
index b4025251..029f8d21 100644
--- a/src/get_hkl.c
+++ b/src/get_hkl.c
@@ -284,7 +284,7 @@ static RefList *expand_reflections(RefList *in, const SymOpList *initial,
 		for ( j=0; j<n; j++ ) {
 
 			signed int he, ke, le;
-			Reflection *new;
+			Reflection *copy;
 			int have_phase;
 			double ph;
 
@@ -294,14 +294,16 @@ static RefList *expand_reflections(RefList *in, const SymOpList *initial,
 			/* Put it into the asymmetric unit for the target */
 			get_asymm(target, he, ke, le, &he, &ke, &le);
 
+			if ( find_refl(out, he, ke, le) != NULL ) continue;
+
 			/* Make sure the intensity is in the right place */
-			new = add_refl(out, he, ke, le);
-			copy_data(new, refl);
+			copy = add_refl(out, he, ke, le);
+			copy_data(copy, refl);
 
 			/* FIXME: Make phase negative if the reflection is
 			 * separated from the original via an inversion */
 			ph = get_phase(refl, &have_phase);
-			if ( have_phase ) set_phase(new, -ph);
+			if ( have_phase ) set_phase(copy, -ph);
 
 		}
 
-- 
cgit v1.2.3