Commit 4f5b240a91a749bc6fe9a27e059e034c404db054
1 parent
0bff785b
minor change to image.h, uncommening the line that uses cimg (line 4). This is n…
…ecessary for the class to properly read .jpg files
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
cuda/cost.h
| @@ -17,7 +17,7 @@ texture<uchar, cudaTextureType2D, cudaReadModeElementType> texIn; | @@ -17,7 +17,7 @@ texture<uchar, cudaTextureType2D, cudaReadModeElementType> texIn; | ||
| 17 | float *result; | 17 | float *result; |
| 18 | float* v_dif; | 18 | float* v_dif; |
| 19 | cudaArray* srcArray; | 19 | cudaArray* srcArray; |
| 20 | -bool testing = FALSE; | 20 | +bool testing = false; |
| 21 | 21 | ||
| 22 | inline void checkCUDAerrors(const char *msg) | 22 | inline void checkCUDAerrors(const char *msg) |
| 23 | { | 23 | { |
| @@ -39,7 +39,7 @@ float get_sum(float *diff) | @@ -39,7 +39,7 @@ float get_sum(float *diff) | ||
| 39 | ret = cublasSetVector(20*10, sizeof(*diff), diff, 1, v_dif, 1); | 39 | ret = cublasSetVector(20*10, sizeof(*diff), diff, 1, v_dif, 1); |
| 40 | if(!testing){ | 40 | if(!testing){ |
| 41 | stim::gpu2image<float>(v_dif, "sample0.bmp", 20,10,0,1); | 41 | stim::gpu2image<float>(v_dif, "sample0.bmp", 20,10,0,1); |
| 42 | - testing = TRUE; | 42 | + testing = true; |
| 43 | } //float* out = (float*) malloc(sizeof(float)); | 43 | } //float* out = (float*) malloc(sizeof(float)); |
| 44 | float out; | 44 | float out; |
| 45 | ret = cublasSasum(handle, 20*10, v_dif, 1, &out); | 45 | ret = cublasSasum(handle, 20*10, v_dif, 1, &out); |
image/image.h