diff --git a/stim/image/image.h b/stim/image/image.h index a6d5195..6b763dc 100644 --- a/stim/image/image.h +++ b/stim/image/image.h @@ -1,6 +1,8 @@ #ifndef STIM_IMAGE_H #define STIM_IMAGE_H -#define cimg_use_jpeg //necessary for JPG files +#ifdef JPEG_FOUND + #define cimg_use_jpeg //necessary for JPG files +#endif #include "CImg.h" #include diff --git a/stim/matlab/rtsEnviLoadClasses.m~ b/stim/matlab/rtsEnviLoadClasses.m~ deleted file mode 100644 index ee30933..0000000 --- a/stim/matlab/rtsEnviLoadClasses.m~ +++ /dev/null @@ -1,11 +0,0 @@ -function [F, C] = rtsEnviLoadClasses(filenames, classnames, ppc) - -Nc = size(filenames, 1); - -for c = 1:Nc - %load the masks - image = imread(filenames{c}); - mask = image(:, :, 1)' > 0; - - -end \ No newline at end of file -- libgit2 0.21.4