From 4f5b240a91a749bc6fe9a27e059e034c404db054 Mon Sep 17 00:00:00 2001
From: Pavel Govyadinov <pgovyadi@gmail.com>
Date: Fri, 29 May 2015 16:10:29 -0500
Subject: [PATCH] minor change to image.h, uncommening the line that uses cimg (line 4). This is necessary for the class to properly read .jpg files

---
 cuda/cost.h   | 4 ++--
 image/image.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cuda/cost.h b/cuda/cost.h
index 54caa4f..db5b7c2 100644
--- a/cuda/cost.h
+++ b/cuda/cost.h
@@ -17,7 +17,7 @@ texture<uchar, cudaTextureType2D, cudaReadModeElementType> texIn;
 float *result;
 float* v_dif;
 cudaArray* srcArray;
-bool testing = FALSE;
+bool testing = false;
 
 inline void checkCUDAerrors(const char *msg)
 {
@@ -39,7 +39,7 @@ float get_sum(float *diff)
 	ret = cublasSetVector(20*10, sizeof(*diff), diff, 1, v_dif, 1);
 	if(!testing){
 		stim::gpu2image<float>(v_dif, "sample0.bmp", 20,10,0,1);
-		testing = TRUE;
+		testing = true;
 	}	//float* out = (float*) malloc(sizeof(float));
 	float out;
 	ret = cublasSasum(handle, 20*10, v_dif, 1, &out);
diff --git a/image/image.h b/image/image.h
index f40b31a..a6d5195 100644
--- a/image/image.h
+++ b/image/image.h
@@ -1,6 +1,6 @@
 #ifndef STIM_IMAGE_H
 #define STIM_IMAGE_H
-//#define cimg_use_jpeg         //necessary for JPG files
+#define cimg_use_jpeg         //necessary for JPG files
 #include "CImg.h"
 
 #include <iostream>
--
libgit2 0.21.4