codebase / stimlib

Commit d661ab7d418f893f954f6cf28bd33cea07c2b359

Authored by David Mayerich
1 parent 7c396e30

linux fixes for stim::image

Showing 1 changed file with 3 additions and 2 deletions   Show diff stats
Inline Side-by-side
stim/image/image.h
  Show/Hide comments   View file @d661ab7
... ... @@ -134,7 +134,7 @@ public:
134 134 memcpy(img, I.img, bytes());
135 135 return *this;
136 136 }
137   -#ifdef USING_OPENCV
  137 +#ifndef USING_OPENCV
138 138 void load_bmp(std::string filename) {
139 139 stim::bmp bitmap;
140 140 bitmap.open(filename); //load the bitmap and read the headers
... ... @@ -278,10 +278,11 @@ public:
278 278 outfile.write((const char*)img, size()); //write the binary data
279 279 outfile.close();
280 280 }
281   -
  281 +#ifndef USING_OPENCV
282 282 void save_bmp(std::string filename) {
283 283 stim::save_bmp(filename, (char*)img, width(), height());
284 284 }
  285 +#endif
285 286  
286 287 //save a file
287 288 void save(std::string filename){
... ...