Merge pull request #996 from mshabunin:cmakeex

Author: vpisarev

modules/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp

@@ -195,7 +195,7 @@ class CV_EXPORTS_W GPCTree : public Algorithm
   int getDescriptorType() const { return params.descriptorType; }
 };
 
-template < int T > class CV_EXPORTS_W GPCForest : public Algorithm
+template < int T > class GPCForest : public Algorithm
 {
 private:
   struct Trail

modules/rgbd/test/test_normal.cpp

@@ -42,7 +42,7 @@ namespace cv
 namespace rgbd
 {
 
-class CV_EXPORTS TickMeter
+class TickMeter
 {
 public:
     TickMeter();