From 1cb3eb535a89dc6c70cd76e6bfcb15688175dec4 Mon Sep 17 00:00:00 2001
From: David Mayerich <mayerich@uh.edu>
Date: Sat, 30 May 2015 08:44:32 -0500
Subject: [PATCH] modified image.h to provide jpeg support if available

---
 stim/image/image.h                |  4 +++-
 stim/matlab/rtsEnviLoadClasses.m~ | 11 -----------
 2 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 stim/matlab/rtsEnviLoadClasses.m~

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 <iostream>
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