aboutsummaryrefslogtreecommitdiff
path: root/src/hdfsee-render.c
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2018-03-21 16:53:31 +0100
committerThomas White <taw@physics.org>2018-03-21 17:01:13 +0100
commit018bff49cd1f5fbd3071b092d0546be67147e893 (patch)
tree585b3a54bd37b9bb7a7a23c32cde42d0909732df /src/hdfsee-render.c
parent0b849787cd825f5d4e5b16f1e64552ecb10d0b76 (diff)
Separate tests for gdk-pixbuf-2.0 and GDK
Diffstat (limited to 'src/hdfsee-render.c')
-rw-r--r--src/hdfsee-render.c39
1 files changed, 16 insertions, 23 deletions
diff --git a/src/hdfsee-render.c b/src/hdfsee-render.c
index 5e1de2f1..d9da469e 100644
--- a/src/hdfsee-render.c
+++ b/src/hdfsee-render.c
@@ -30,15 +30,16 @@
#include <config.h>
#endif
-#ifdef HAVE_GTK
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
#include <stdlib.h>
#include <math.h>
#include <stdint.h>
#include <assert.h>
+
+#ifdef HAVE_GDKPIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
+
#ifdef HAVE_TIFF
#include <tiffio.h>
#endif
@@ -46,8 +47,6 @@
#include <render.h>
#include <image.h>
-#include "dw-hdfsee.h"
-
static float *get_binned_panel(struct image *image, int binning,
int pi, double *max, int *pw, int *ph)
{
@@ -107,6 +106,8 @@ static float *get_binned_panel(struct image *image, int binning,
}
+#ifdef HAVE_GDKPIXBUF
+
/* NB This function is shared between render_get_image() and
* render_get_colour_scale() */
static void render_free_data(guchar *data, gpointer p)
@@ -260,17 +261,15 @@ GdkPixbuf *render_get_colour_scale(size_t w, size_t h, int scale)
w, h, w*3, render_free_data, NULL);
}
+#endif /* HAVE_GDKPIXBUF */
-int render_tiff_fp(DisplayWindow *dw, struct image *image, const char *filename)
+int render_tiff_fp(struct image *image, const char *filename, int min_x, int max_x,
+ int min_y, int max_y)
{
#ifdef HAVE_TIFF
TIFF *th;
int16_t *line;
int x, y;
- int min_x = (int)dw->min_x;
- int max_x = (int)dw->max_x;
- int min_y = (int)dw->min_y;
- int max_y = (int)dw->max_y;
int width = max_x - min_x;
int height = max_y - min_y;
float *buf;
@@ -331,24 +330,20 @@ int render_tiff_fp(DisplayWindow *dw, struct image *image, const char *filename)
TIFFClose(th);
free(buf);
-#else
+#else /* HAVE_TIFF */
STATUS("No TIFF support.\n");
-#endif
+#endif /* HAVE_TIFF */
return 0;
}
-int render_tiff_int16(DisplayWindow *dw, struct image *image,
- const char *filename, double boost)
+int render_tiff_int16(struct image *image, const char *filename, double boost,
+ int min_x, int max_x, int min_y, int max_y)
{
#ifdef HAVE_TIFF
TIFF *th;
int16_t *line;
int x, y;
- int min_x = (int)dw->min_x;
- int max_x = (int)dw->max_x;
- int min_y = (int)dw->min_y;
- int max_y = (int)dw->max_y;
int width = max_x - min_x;
int height = max_y - min_y;
int16_t *buf;
@@ -417,10 +412,8 @@ int render_tiff_int16(DisplayWindow *dw, struct image *image,
TIFFClose(th);
free(buf);
-#else
+#else /* HAVE_TIFF */
STATUS("No TIFF support.\n");
-#endif
+#endif /* HAVE_TIFF */
return 0;
}
-
-#endif /* HAVE_GTK */