codebase / stimlib

Commit 1cb3eb535a89dc6c70cd76e6bfcb15688175dec4

Authored by David Mayerich
1 parent 35bdff22

modified image.h to provide jpeg support if available

Showing 2 changed files with 3 additions and 12 deletions   Show diff stats
Inline Side-by-side
stim/image/image.h
  Show/Hide comments   View file @1cb3eb5
1 #ifndef STIM_IMAGE_H 1 #ifndef STIM_IMAGE_H
2 #define STIM_IMAGE_H 2 #define STIM_IMAGE_H
3 -#define cimg_use_jpeg //necessary for JPG files 3 +#ifdef JPEG_FOUND
  4 + #define cimg_use_jpeg //necessary for JPG files
  5 +#endif
4 #include "CImg.h" 6 #include "CImg.h"
5 7
6 #include <iostream> 8 #include <iostream>
stim/matlab/rtsEnviLoadClasses.m~ deleted
View file @35bdff2
1 -function [F, C] = rtsEnviLoadClasses(filenames, classnames, ppc)  
2 -  
3 -Nc = size(filenames, 1);  
4 -  
5 -for c = 1:Nc  
6 - %load the masks  
7 - image = imread(filenames{c});  
8 - mask = image(:, :, 1)' > 0;  
9 -  
10 -  
11 -end  
12 \ No newline at end of file 0 \ No newline at end of file