more compilation

modules/dnn/CMakeLists.txt

@@ -14,6 +14,8 @@ else()
   message(FATAL_ERROR "Could not find PROTOBUF Compiler")
 endif()
 
+include_directories(src/caffe)
+
 file(GLOB PROTO_FILES src/*.proto)
 PROTOBUF_GENERATE_CPP(PROTO_HDRS PROTO_SRCS ${PROTO_FILES})
 

modules/dnn/include/opencv2/dnn.hpp

@@ -108,7 +108,7 @@ namespace dnn
     {
     public:
 
-        CV_EXPORTS static Ptr<NetConfiguration> create();
+        static Ptr<NetConfiguration> create();
 
         int addLayer(const String &name, const String &type);
 
@@ -145,7 +145,7 @@ namespace dnn
     {
     public:
 
-        CV_EXPORTS static Ptr<Net> create(Ptr<NetConfiguration> config);
+        static Ptr<Net> create(Ptr<NetConfiguration> config);
 
         virtual ~Net() = 0;
 

modules/dnn/include/opencv2/dnn/dnn.inl.hpp

@@ -7,26 +7,23 @@ namespace cv
 {
 namespace dnn
 {
-    inline 
+    inline Mat& Blob::getMatRef()
-    Mat& Blob::getMatRef()
     {
         return m;
     }
 
-    inline
+    inline const Mat& Blob::getMatRef() const
-    const Mat& Blob::getMatRef() const
     {
         return m;
     }
 
-    inline
+    inline Mat Blob::getMat()
-    Mat Blob::getMat()
     {
         return m;
     }
 
 
-    Mat Blob::getMat(int num, int channel)
+    inline Mat Blob::getMat(int num, int channel)
     {
         CV_Assert(false);
         return Mat();