aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2014-05-21 14:39:43 +0200
committerThomas White <taw@physics.org>2014-05-21 14:40:39 +0200
commit2658f7ca3fbdd0f037b9286812e6967b42517c0d (patch)
tree7b91ce10b19268df146f1b6fd651f24892b96c56
parent7d588769ea5ba5f57e8deac2dfeda94bc194b198 (diff)
Tidy up headers
-rw-r--r--libcrystfel/src/detector.h7
-rw-r--r--libcrystfel/src/hdf5-file.h10
-rw-r--r--libcrystfel/src/image.h8
-rw-r--r--libcrystfel/src/index.h4
4 files changed, 17 insertions, 12 deletions
diff --git a/libcrystfel/src/detector.h b/libcrystfel/src/detector.h
index c63326fb..b87e6dc9 100644
--- a/libcrystfel/src/detector.h
+++ b/libcrystfel/src/detector.h
@@ -36,8 +36,11 @@
#ifndef DETECTOR_H
#define DETECTOR_H
-struct image;
-struct hdfile;
+struct rigid_group;
+struct detector;
+struct panel;
+struct badregion;
+struct detector;
#include "hdf5-file.h"
#include "image.h"
diff --git a/libcrystfel/src/hdf5-file.h b/libcrystfel/src/hdf5-file.h
index f0a363e8..010abacc 100644
--- a/libcrystfel/src/hdf5-file.h
+++ b/libcrystfel/src/hdf5-file.h
@@ -3,11 +3,11 @@
*
* Read/write HDF5 data files
*
- * Copyright © 2012 Deutsches Elektronen-Synchrotron DESY,
- * a research centre of the Helmholtz Association.
+ * Copyright © 2012-2014 Deutsches Elektronen-Synchrotron DESY,
+ * a research centre of the Helmholtz Association.
*
* Authors:
- * 2009-2012 Thomas White <taw@physics.org>
+ * 2009-2014 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*
@@ -36,12 +36,10 @@
#include <stdint.h>
#include <hdf5.h>
-#include "image.h"
-
struct hdfile;
-
struct copy_hdf5_field;
+#include "image.h"
extern int hdf5_write(const char *filename, const void *data,
int width, int height, int type);
diff --git a/libcrystfel/src/image.h b/libcrystfel/src/image.h
index 6b49ad91..213bcfec 100644
--- a/libcrystfel/src/image.h
+++ b/libcrystfel/src/image.h
@@ -3,11 +3,11 @@
*
* Handle images and image features
*
- * Copyright © 2012-2013 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2014 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2009-2013 Thomas White <taw@physics.org>
+ * 2009-2014 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*
@@ -37,6 +37,10 @@
#include <complex.h>
#include <sys/types.h>
+struct imagefeature;
+struct sample;
+struct image;
+
#include "utils.h"
#include "cell.h"
#include "detector.h"
diff --git a/libcrystfel/src/index.h b/libcrystfel/src/index.h
index 2d3a500b..4149f789 100644
--- a/libcrystfel/src/index.h
+++ b/libcrystfel/src/index.h
@@ -3,13 +3,13 @@
*
* Perform indexing (somehow)
*
- * Copyright © 2012-2013 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2014 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
* Copyright © 2012 Richard Kirian
* Copyright © 2012 Lorenzo Galli
*
* Authors:
- * 2010-2013 Thomas White <taw@physics.org>
+ * 2010-2014 Thomas White <taw@physics.org>
* 2010 Richard Kirian
* 2012 Lorenzo Galli
*