From c2090c67aa80e85344fe32461730beeedc15ee69 Mon Sep 17 00:00:00 2001
From: jaco <f.puja@yahoo.it>
Date: Mon, 28 Jul 2014 15:52:53 +0200
Subject: [PATCH] some BING header moved

---
 .../{src/BING => include/opencv2/saliency}/FilterTIG.h     | 0
 .../{src/BING => include/opencv2/saliency}/ValStructVec.h  | 0
 .../{src/BING => include/opencv2/saliency}/kyheader.h      | 7 +++----
 .../opencv2/saliency/saliencySpecializedClasses.hpp        | 6 +++---
 modules/saliency/src/BING/CmFile.cpp                       | 1 -
 modules/saliency/src/BING/CmShow.cpp                       | 1 -
 modules/saliency/src/BING/CmTimer.h                        | 1 -
 modules/saliency/src/BING/FilterTIG.cpp                    | 2 --
 modules/saliency/src/BING/objectnessBING.cpp               | 3 +++
 9 files changed, 9 insertions(+), 12 deletions(-)
 rename modules/saliency/{src/BING => include/opencv2/saliency}/FilterTIG.h (100%)
 rename modules/saliency/{src/BING => include/opencv2/saliency}/ValStructVec.h (100%)
 rename modules/saliency/{src/BING => include/opencv2/saliency}/kyheader.h (98%)

diff --git a/modules/saliency/src/BING/FilterTIG.h b/modules/saliency/include/opencv2/saliency/FilterTIG.h
similarity index 100%
rename from modules/saliency/src/BING/FilterTIG.h
rename to modules/saliency/include/opencv2/saliency/FilterTIG.h
diff --git a/modules/saliency/src/BING/ValStructVec.h b/modules/saliency/include/opencv2/saliency/ValStructVec.h
similarity index 100%
rename from modules/saliency/src/BING/ValStructVec.h
rename to modules/saliency/include/opencv2/saliency/ValStructVec.h
diff --git a/modules/saliency/src/BING/kyheader.h b/modules/saliency/include/opencv2/saliency/kyheader.h
similarity index 98%
rename from modules/saliency/src/BING/kyheader.h
rename to modules/saliency/include/opencv2/saliency/kyheader.h
index 7385aca9d..285f68345 100644
--- a/modules/saliency/src/BING/kyheader.h
+++ b/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
diff --git a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp b/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp
index 4f3ab8a22..2fd3c7a84 100644
--- a/modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp
+++ b/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>
diff --git a/modules/saliency/src/BING/CmFile.cpp b/modules/saliency/src/BING/CmFile.cpp
index ed9f4dfab..0b466b9b0 100644
--- a/modules/saliency/src/BING/CmFile.cpp
+++ b/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);
diff --git a/modules/saliency/src/BING/CmShow.cpp b/modules/saliency/src/BING/CmShow.cpp
index 588e902fc..ce6f6eee8 100644
--- a/modules/saliency/src/BING/CmShow.cpp
+++ b/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>
diff --git a/modules/saliency/src/BING/CmTimer.h b/modules/saliency/src/BING/CmTimer.h
index dcd6bfb93..700a4e0cc 100644
--- a/modules/saliency/src/BING/CmTimer.h
+++ b/modules/saliency/src/BING/CmTimer.h
@@ -43,7 +43,6 @@
 #ifndef CMTIMER_H
 #define CMTIMER_H
 
-#include "kyheader.h"
 
 class CmTimer
 {
diff --git a/modules/saliency/src/BING/FilterTIG.cpp b/modules/saliency/src/BING/FilterTIG.cpp
index e874e8c6c..54f0242e7 100644
--- a/modules/saliency/src/BING/FilterTIG.cpp
+++ b/modules/saliency/src/BING/FilterTIG.cpp
@@ -39,8 +39,6 @@
  //
  //M*/
 
-#include "kyheader.h"
-#include "FilterTIG.h"
 #include "CmShow.h"
 
 using namespace cv;
diff --git a/modules/saliency/src/BING/objectnessBING.cpp b/modules/saliency/src/BING/objectnessBING.cpp
index 8e7e3f76f..4e3b7f56c 100644
--- a/modules/saliency/src/BING/objectnessBING.cpp
+++ b/modules/saliency/src/BING/objectnessBING.cpp
@@ -41,6 +41,9 @@
 
 #include "precomp.hpp"
 
+#include "CmTimer.h"
+#include "CmFile.h"
+
 namespace cv
 {