some BING header moved

modules/saliency/src/BING/kyheader.h → modules/saliency/include/opencv2/saliency/kyheader.h

@@ -168,8 +168,8 @@ inline cv::Rect Vec4i2Rect( cv::Vec4i &v )
 #define INT64 long long
 #else
 #define INT64 long
-//typedef unsigned long UINT64;
-#define UINT64 unsigned long
+typedef unsigned long UINT64;
+//#define UINT64 unsigned long
 #endif
 
 /*
@@ -275,6 +275,5 @@ inline int popcnt_byte( register uint32_t u )
 }
 
 /////
-#include "CmTimer.h"
-#include "CmFile.h"
+
 #endif // KYHEADER_H

modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp

@@ -43,9 +43,9 @@
 #define __OPENCV_SALIENCY_SPECIALIZED_CLASSES_HPP__
 
 #include "saliencyBaseClasses.hpp"
-#include "BING/kyheader.h"
-#include "BING/ValStructVec.h"
-#include "BING/FilterTIG.h"
+#include "kyheader.h"
+#include "ValStructVec.h"
+#include "FilterTIG.h"
 #include <cstdio>
 #include <string>
 #include <iostream>

modules/saliency/src/BING/CmFile.cpp

@@ -39,7 +39,6 @@
  //
  //M*/
 
-#include "kyheader.h"
 #include "CmFile.h"
 
 // Get image names from a wildcard. Eg: GetNames("D:\\*.jpg", imgNames);

modules/saliency/src/BING/CmShow.cpp

@@ -39,7 +39,6 @@
  //
  //M*/
 
-#include "kyheader.h"
 #include "CmShow.h"
 #include "opencv2/core.hpp"
 #include <opencv2/highgui.hpp>

modules/saliency/src/BING/CmTimer.h

@@ -43,7 +43,6 @@
 #ifndef CMTIMER_H
 #define CMTIMER_H
 
-#include "kyheader.h"
 
 class CmTimer
 {

modules/saliency/src/BING/FilterTIG.cpp

@@ -39,8 +39,6 @@
  //
  //M*/
 
-#include "kyheader.h"
-#include "FilterTIG.h"
 #include "CmShow.h"
 
 using namespace cv;

modules/saliency/src/BING/objectnessBING.cpp

@@ -41,6 +41,9 @@
 
 #include "precomp.hpp"
 
+#include "CmTimer.h"
+#include "CmFile.h"
+
 namespace cv
 {