From c2212fbdf8112e254695ce65987ea197b80dc202 Mon Sep 17 00:00:00 2001
From: "Hao.Chen" <11779668+ewail@users.noreply.github.com>
Date: Thu, 28 Nov 2019 16:38:05 +0800
Subject: [PATCH 1/4] Make R package compilation support opencv 4.0

Make R package compilation support opencv 4.0
---
 R-package/src/im2rec.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/R-package/src/im2rec.h b/R-package/src/im2rec.h
index a6abe1146b56..71abb370d7bd 100644
--- a/R-package/src/im2rec.h
+++ b/R-package/src/im2rec.h
@@ -23,6 +23,14 @@
  * \brief Export module that takes charge of code generation and document
  *  Generation for functions exported from R-side
  */
+#include <opencv2/core/version.hpp>
+#if CV_VERSION_MAJOR >= 4
+
+#define CV_IMWRITE_PNG_COMPRESSION cv::IMWRITE_PNG_COMPRESSION
+#define CV_IMWRITE_JPEG_QUALITY cv::IMWRITE_JPEG_QUALITY
+
+#endif  // CV_VERSION_MAJOR >= 4
+
 
 #ifndef MXNET_RCPP_IM2REC_H_
 #define MXNET_RCPP_IM2REC_H_

From ca0889471c8d50207b7990f0bbb87a4409e4c6bf Mon Sep 17 00:00:00 2001
From: JackieWu <wkcn@live.cn>
Date: Fri, 29 Nov 2019 11:04:32 +0800
Subject: [PATCH 2/4] move opencv definition

---
 R-package/src/im2rec.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/R-package/src/im2rec.h b/R-package/src/im2rec.h
index 71abb370d7bd..c2be147967b3 100644
--- a/R-package/src/im2rec.h
+++ b/R-package/src/im2rec.h
@@ -23,20 +23,17 @@
  * \brief Export module that takes charge of code generation and document
  *  Generation for functions exported from R-side
  */
-#include <opencv2/core/version.hpp>
-#if CV_VERSION_MAJOR >= 4
-
-#define CV_IMWRITE_PNG_COMPRESSION cv::IMWRITE_PNG_COMPRESSION
-#define CV_IMWRITE_JPEG_QUALITY cv::IMWRITE_JPEG_QUALITY
-
-#endif  // CV_VERSION_MAJOR >= 4
-
-
 #ifndef MXNET_RCPP_IM2REC_H_
 #define MXNET_RCPP_IM2REC_H_
 
 #include <Rcpp.h>
 #include <string>
+#include <opencv2/core/version.hpp>
+#if CV_VERSION_MAJOR >= 4
+#include <opencv2/opencv.hpp>
+#define CV_IMWRITE_PNG_COMPRESSION cv::IMWRITE_PNG_COMPRESSION
+#define CV_IMWRITE_JPEG_QUALITY cv::IMWRITE_JPEG_QUALITY
+#endif  // CV_VERSION_MAJOR >= 4
 
 namespace mxnet {
 namespace R {

From b100f6ed4ecd390840c5c65983ee962be0a890d1 Mon Sep 17 00:00:00 2001
From: JackieWu <wkcn@live.cn>
Date: Fri, 29 Nov 2019 12:00:54 +0800
Subject: [PATCH 3/4] CI


From 88f58471dab35b7feedf02f51ab3a7598e285565 Mon Sep 17 00:00:00 2001
From: JackieWu <wkcn@live.cn>
Date: Thu, 5 Dec 2019 14:24:57 +0800
Subject: [PATCH 4/4] ci

---
 R-package/src/im2rec.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/R-package/src/im2rec.h b/R-package/src/im2rec.h
index c2be147967b3..b9e82da0f079 100644
--- a/R-package/src/im2rec.h
+++ b/R-package/src/im2rec.h
@@ -23,6 +23,7 @@
  * \brief Export module that takes charge of code generation and document
  *  Generation for functions exported from R-side
  */
+
 #ifndef MXNET_RCPP_IM2REC_H_
 #define MXNET_RCPP_IM2REC_H_