core: fix String::end() implementation

pull/8159/head
Alexander Alekhin 8 years ago
parent 3450528fad
commit 9ac9e9e29a
  1. 2
      modules/core/include/opencv2/core/cvstd.hpp
  2. 7
      modules/core/test/test_misc.cpp

@ -748,7 +748,7 @@ const char* String::begin() const
inline
const char* String::end() const
{
return len_ ? cstr_ + 1 : 0;
return len_ ? cstr_ + len_ : NULL;
}
inline

@ -138,3 +138,10 @@ TEST(Core_String, find_last_of__with__empty_string)
// npos is not exported: EXPECT_EQ(cv::String::npos, p);
EXPECT_EQ(std::string::npos, p);
}
TEST(Core_String, end_method_regression)
{
cv::String old_string = "012345";
cv::String new_string(old_string.begin(), old_string.end());
EXPECT_EQ(6u, new_string.size());
}

Loading…
Cancel
Save