Commit bdb26b3d authored by jaco's avatar jaco

new windows build error fixing 2

parent dd951a80
...@@ -47,7 +47,7 @@ namespace cv ...@@ -47,7 +47,7 @@ namespace cv
namespace saliency namespace saliency
{ {
bool CmFile::MkDir( CStr &_path ) bool CmFile::MkDir( std::string &_path )
{ {
if( _path.size() == 0 ) if( _path.size() == 0 )
return false; return false;
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <dirent.h> #include <dirent.h>
#include "BING/kyheader.hpp" #include "kyheader.hpp"
#endif #endif
namespace cv namespace cv
...@@ -59,7 +59,7 @@ namespace saliency ...@@ -59,7 +59,7 @@ namespace saliency
struct CmFile struct CmFile
{ {
static bool MkDir(CStr& path); static bool MkDir(std::string& path);
}; };
} }
......
...@@ -87,11 +87,6 @@ typedef unsigned char BYTE; ...@@ -87,11 +87,6 @@ typedef unsigned char BYTE;
#include <windows.h> #include <windows.h>
#endif #endif
namespace cv
{
namespace saliency
{
typedef std::vector<int> vecI; typedef std::vector<int> vecI;
typedef const std::string CStr; typedef const std::string CStr;
typedef const cv::Mat CMat; typedef const cv::Mat CMat;
...@@ -100,6 +95,11 @@ typedef std::vector<cv::Mat> vecM; ...@@ -100,6 +95,11 @@ typedef std::vector<cv::Mat> vecM;
typedef std::vector<float> vecF; typedef std::vector<float> vecF;
typedef std::vector<double> vecD; typedef std::vector<double> vecD;
namespace cv
{
namespace saliency
{
enum enum
{ {
CV_FLIP_BOTH = -1, CV_FLIP_BOTH = -1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment