Use unsigned types for image storage

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@82 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 6 insertions, 6 deletions

diff --git a/src/imagedisplay.c b/src/imagedisplay.c
index 3a87aa5..d60b789 100644
--- a/src/imagedisplay.c
+++ b/src/imagedisplay.c
@@ -72,11 +72,11 @@ static gboolean imagedisplay_configure_event(GtkWidget *widget, GdkEventConfigur
 
 }
 
-static void imagedisplay_put_data(ImageDisplay *imagedisplay, int16_t *image16) {
+static void imagedisplay_put_data(ImageDisplay *imagedisplay, uint16_t *image16) {
 
 	unsigned int x, y;
 	unsigned int w, h;
-	int16_t min, max;
+	int min, max;
 	
 	h = imagedisplay->height;
 	w = imagedisplay->width;
@@ -84,19 +84,19 @@ static void imagedisplay_put_data(ImageDisplay *imagedisplay, int16_t *image16)
 	min = 0;  max = 0;
 	for ( y=0; y<h; y++ ) {
 		for ( x=0; x<w; x++ ) {
-			int16_t val;
+			uint16_t val;
 			val = image16[x+w*y];
 			if ( val > max ) max = val;
 			if ( val < min ) min = val;
 		}
 	}
-	
+	printf("min=%i, max=%i\n", min, max);
 	/* Turn 16-bit image data into 8-bit display data */
 	imagedisplay->data = malloc(3*w*h);
 	for ( y=0; y<h; y++ ) {
 		for ( x=0; x<w; x++ ) {
 		
-			int16_t val16, val8;
+			uint16_t val16, val8;
 			
 			val16 = image16[x+w*y];
 			val8 = (255*(val16-min)) / (max-min);
@@ -121,7 +121,7 @@ static void imagedisplay_close(GtkWidget *widget, ImageDisplay *imagedisplay) {
 }
 
 /* Display an image */
-ImageDisplay *imagedisplay_open(int16_t *image, unsigned int width, unsigned int height, const char *title) {
+ImageDisplay *imagedisplay_open(uint16_t *image, unsigned int width, unsigned int height, const char *title) {
 
 	ImageDisplay *imagedisplay;
 	GdkGeometry geom;