generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile opencv_test_core with cv::String instead of std::string

Browse Source 
All tests passed!
This commit is contained in:
Andrey Kamaev
2013-03-20 17:53:13 +04:00
parent 14bb4cbe1e
commit 762aefd71b
51 changed files with 598 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/highgui/src/grfmt_base.hpp
View File

@@ -65,21 +65,21 @@ public:
int height() const { return m_height; };
virtual int type() const { return m_type; };
virtual bool setSource( const std::string& filename );
virtual bool setSource( const cv::String& filename );
virtual bool setSource( const Mat& buf );
virtual bool readHeader() = 0;
virtual bool readData( Mat& img ) = 0;
virtual size_t signatureLength() const;
virtual bool checkSignature( const std::string& signature ) const;
virtual bool checkSignature( const cv::String& signature ) const;
virtual ImageDecoder newDecoder() const;
protected:
int m_width; // width of the image ( filled by readHeader )
int m_height; // height of the image ( filled by readHeader )
int m_type;
std::string m_filename;
std::string m_signature;
cv::String m_filename;
cv::String m_signature;
Mat m_buf;
bool m_buf_supported;
};
@@ -93,23 +93,23 @@ public:
virtual ~BaseImageEncoder() {};
virtual bool isFormatSupported( int depth ) const;
virtual bool setDestination( const std::string& filename );
virtual bool setDestination( const cv::String& filename );
virtual bool setDestination( std::vector<uchar>& buf );
virtual bool write( const Mat& img, const std::vector<int>& params ) = 0;
virtual std::string getDescription() const;
virtual cv::String getDescription() const;
virtual ImageEncoder newEncoder() const;
virtual void throwOnEror() const;
protected:
std::string m_description;
cv::String m_description;
std::string m_filename;
cv::String m_filename;
std::vector<uchar>* m_buf;
bool m_buf_supported;
std::string m_last_error;
cv::String m_last_error;
};
}