image_add_feature: Remove "image" argument

It hasn't been needed for ages.

7 files changed, 10 insertions, 19 deletions

diff --git a/libcrystfel/src/image-hdf5.c b/libcrystfel/src/image-hdf5.c
index 66b93d90..37d333ac 100644
--- a/libcrystfel/src/image-hdf5.c
+++ b/libcrystfel/src/image-hdf5.c
@@ -1410,8 +1410,7 @@ ImageFeatureList *image_hdf5_read_peaks_cxi(const DataTemplate *dtempl,
 			ERROR("Failed to convert %i,%i to "
 			      "panel-relative coordinates\n", fs, ss);
 		} else {
-			image_add_feature(features, fs, ss, pn,
-			                  NULL, val, NULL);
+			image_add_feature(features, fs, ss, pn, val, NULL);
 		}
 
 	}
@@ -1537,8 +1536,7 @@ ImageFeatureList *image_hdf5_read_peaks_hdf5(const DataTemplate *dtempl,
 			ERROR("Failed to convert %i,%i to "
 			      "panel-relative coordinates\n", fs, ss);
 		} else {
-			image_add_feature(features, fs, ss, pn,
-			                  NULL, val, NULL);
+			image_add_feature(features, fs, ss, pn, val, NULL);
 		}
 
 	}
diff --git a/libcrystfel/src/image-msgpack.c b/libcrystfel/src/image-msgpack.c
index 0fdb104c..4ec55921 100644
--- a/libcrystfel/src/image-msgpack.c
+++ b/libcrystfel/src/image-msgpack.c
@@ -220,8 +220,7 @@ ImageFeatureList *image_msgpack_read_peaks(const DataTemplate *dtempl,
 			ERROR("Failed to convert %i,%i to "
 			      "panel-relative coordinates\n", fs, ss);
 		} else {
-			image_add_feature(features, fs, ss, pn,
-			                  NULL, val, NULL);
+			image_add_feature(features, fs, ss, pn, val, NULL);
 		}
 	}
 
diff --git a/libcrystfel/src/image.c b/libcrystfel/src/image.c
index 95bc56e5..53ae796d 100644
--- a/libcrystfel/src/image.c
+++ b/libcrystfel/src/image.c
@@ -153,8 +153,7 @@ struct _imagefeaturelist
 
 
 void image_add_feature(ImageFeatureList *flist, double fs, double ss,
-                       int pn,
-                       struct image *parent, double intensity, const char *name)
+                       int pn, double intensity, const char *name)
 {
 	if ( flist->n_features == flist->max_features ) {
 		struct imagefeature *nf;
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h
index eafc5f83..7e4bad1f 100644
--- a/libcrystfel/src/image.h
+++ b/libcrystfel/src/image.h
@@ -201,9 +201,7 @@ extern ImageFeatureList *image_feature_list_new(void);
 extern void image_feature_list_free(ImageFeatureList *flist);
 
 extern void image_add_feature(ImageFeatureList *flist, double x, double y,
-                              int pn,
-                              struct image *parent, double intensity,
-                              const char *name);
+                              int pn, double intensity, const char *name);
 
 extern void image_remove_feature(ImageFeatureList *flist, int idx);
 
diff --git a/libcrystfel/src/peakfinder8.c b/libcrystfel/src/peakfinder8.c
index 80a219cb..4c41040a 100644
--- a/libcrystfel/src/peakfinder8.c
+++ b/libcrystfel/src/peakfinder8.c
@@ -1457,8 +1457,7 @@ int peakfinder8(struct image *img, int max_n_peaks,
 			image_add_feature(img->features,
 			                  pkdata->com_fs[pki]+0.5,
 			                  pkdata->com_ss[pki]+0.5,
-			                  pi, img, pkdata->tot_i[pki],
-			                  NULL);
+			                  pi, pkdata->tot_i[pki], NULL);
 		}
 	}
 	profile_end("pf8-search");
diff --git a/libcrystfel/src/peaks.c b/libcrystfel/src/peaks.c
index 837c00fc..6de36e4a 100644
--- a/libcrystfel/src/peaks.c
+++ b/libcrystfel/src/peaks.c
@@ -401,7 +401,7 @@ static void search_peaks_in_panel(struct image *image, float threshold,
 
 		/* Add using "better" coordinates */
 		image_add_feature(image->features, f_fs, f_ss, pn,
-		                  image, intensity, NULL);
+		                  intensity, NULL);
 		nacc++;
 
 		if ( nacc > 10000 ) {
@@ -547,7 +547,7 @@ int search_peaks_peakfinder9(struct image *image, float min_snr_biggest_pix,
 			image_add_feature(image->features,
 			                  peakList.centerOfMass_rawX[peak_number],
 			                  peakList.centerOfMass_rawY[peak_number],
-			                  panel_number, image,
+			                  panel_number,
 			                  peakList.totalIntensity[peak_number],
 			                  NULL);
 		}
@@ -723,8 +723,7 @@ void validate_peaks(struct image *image, double min_snr,
 		}
 
 		/* Add using "better" coordinates */
-		image_add_feature(flist, f->fs, f->ss, f->pn, image,
-		                  intensity, NULL);
+		image_add_feature(flist, f->fs, f->ss, f->pn, intensity, NULL);
 
 	}
 
diff --git a/libcrystfel/src/stream.c b/libcrystfel/src/stream.c
index e767b59f..71dd7413 100644
--- a/libcrystfel/src/stream.c
+++ b/libcrystfel/src/stream.c
@@ -148,8 +148,7 @@ static ImageFeatureList *read_peaks(Stream *st, struct image *image)
 				ERROR("Failed to convert peak coords\n");
 			} else {
 				image_add_feature(features, x, y,
-				                  pn, image, intensity,
-				                  NULL);
+				                  pn, intensity, NULL);
 			}
 
 		}