From 111b749d030b976758b2de337133d881fe47ffdc Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Thu, 3 Aug 2017 20:42:40 +0300
Subject: [PATCH] fixed load image for OpenCV 3.0

---
 src/image.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/image.c b/src/image.c
index 35bd8a04..5835b4b5 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1305,9 +1305,15 @@ image load_image_stb(char *filename, int channels)
 image load_image(char *filename, int w, int h, int c)
 {
 #ifdef OPENCV
-    image out = load_image_cv(filename, c);
+
+#ifndef CV_VERSION_EPOCH
+	image out = load_image_stb(filename, c);	// OpenCV 3.x
+#else
+	image out = load_image_cv(filename, c);		// OpenCV 2.4.x
+#endif
+
 #else
-    image out = load_image_stb(filename, c);
+    image out = load_image_stb(filename, c);	// without OpenCV
 #endif
 
     if((h && w) && (h != out.h || w != out.w)){