opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-20 12:55:15 +08:00
Code Issues Releases Wiki Activity

some BING header moved

Browse Source
This commit is contained in:
jaco
2014-07-28 15:52:53 +02:00
parent d5d6f0a211
commit c2090c67aa
9 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
modules/saliency/src/BING/FilterTIG.h → modules/saliency/include/opencv2/saliency/FilterTIG.h
View File

0
modules/saliency/src/BING/ValStructVec.h → modules/saliency/include/opencv2/saliency/ValStructVec.h
View File

7
modules/saliency/src/BING/kyheader.h → modules/saliency/include/opencv2/saliency/kyheader.h
View File

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

6
modules/saliency/include/opencv2/saliency/saliencySpecializedClasses.hpp
View File

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

1
modules/saliency/src/BING/CmFile.cpp
View File

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

1
modules/saliency/src/BING/CmShow.cpp
View File

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

1
modules/saliency/src/BING/CmTimer.h
View File

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

2
modules/saliency/src/BING/FilterTIG.cpp
View File

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

3
modules/saliency/src/BING/objectnessBING.cpp
View File

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