From d661ab7d418f893f954f6cf28bd33cea07c2b359 Mon Sep 17 00:00:00 2001
From: David Mayerich <mayerich@uh.edu>
Date: Fri, 24 Feb 2017 11:22:46 -0600
Subject: [PATCH] linux fixes for stim::image

---
 stim/image/image.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/stim/image/image.h b/stim/image/image.h
index 9eb07ed..30e096f 100644
--- a/stim/image/image.h
+++ b/stim/image/image.h
@@ -134,7 +134,7 @@ public:
 		memcpy(img, I.img, bytes());
 		return *this;
 	}
-#ifdef USING_OPENCV
+#ifndef USING_OPENCV
 	void load_bmp(std::string filename) {
 		stim::bmp bitmap;
 		bitmap.open(filename);											//load the bitmap and read the headers
@@ -278,10 +278,11 @@ public:
 		outfile.write((const char*)img, size());			//write the binary data
 		outfile.close();
 	}
-
+#ifndef USING_OPENCV
 	void save_bmp(std::string filename) {
 		stim::save_bmp(filename, (char*)img, width(), height());
 	}
+#endif
 
 	//save a file
 	void save(std::string filename){
--
libgit2 0.21.4