Getting rid of compiler warnings.
This commit is contained in:
parent
4c2e0bd9a0
commit
ef15d5c2cd
4 changed files with 834 additions and 831 deletions
|
@ -802,14 +802,14 @@ void post_process_output_file(FaceAnalysis::FaceAnalyser& face_analyser, string
|
||||||
outfile << output_file_contents[0].c_str() << endl;
|
outfile << output_file_contents[0].c_str() << endl;
|
||||||
|
|
||||||
// Write the contents
|
// Write the contents
|
||||||
for (size_t i = 1; i < output_file_contents.size(); ++i)
|
for (int i = 1; i < (int)output_file_contents.size(); ++i)
|
||||||
{
|
{
|
||||||
std::vector<std::string> tokens;
|
std::vector<std::string> tokens;
|
||||||
boost::split(tokens, output_file_contents[i], boost::is_any_of(","));
|
boost::split(tokens, output_file_contents[i], boost::is_any_of(","));
|
||||||
|
|
||||||
outfile << tokens[0];
|
outfile << tokens[0];
|
||||||
|
|
||||||
for (size_t t = 1; t < tokens.size(); ++t)
|
for (int t = 1; t < (int)tokens.size(); ++t)
|
||||||
{
|
{
|
||||||
if (t >= begin_ind && t < end_ind)
|
if (t >= begin_ind && t < end_ind)
|
||||||
{
|
{
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1595,9 +1595,10 @@ namespace dlib
|
||||||
explicit literal_assign_helper(matrix* m_): m(m_), r(0), c(0),has_been_used(false) {next();}
|
explicit literal_assign_helper(matrix* m_): m(m_), r(0), c(0),has_been_used(false) {next();}
|
||||||
~literal_assign_helper()
|
~literal_assign_helper()
|
||||||
{
|
{
|
||||||
DLIB_CASSERT(!has_been_used || r == m->nr(),
|
assert(!has_been_used || r == m->nr());
|
||||||
"You have used the matrix comma based assignment incorrectly by failing to\n"
|
//DLIB_CASSERT(!has_been_used || r == m->nr(),
|
||||||
"supply a full set of values for every element of a matrix object.\n");
|
// "You have used the matrix comma based assignment incorrectly by failing to\n"
|
||||||
|
// "supply a full set of values for every element of a matrix object.\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
const literal_assign_helper& operator, (
|
const literal_assign_helper& operator, (
|
||||||
|
|
|
@ -23,9 +23,11 @@ namespace dlib
|
||||||
|
|
||||||
cv_image (const cv::Mat img)
|
cv_image (const cv::Mat img)
|
||||||
{
|
{
|
||||||
DLIB_CASSERT(img.depth() == cv::DataType<typename pixel_traits<pixel_type>::basic_pixel_type>::depth &&
|
assert(img.depth() == cv::DataType<typename pixel_traits<pixel_type>::basic_pixel_type>::depth &&
|
||||||
img.channels() == pixel_traits<pixel_type>::num,
|
img.channels() == pixel_traits<pixel_type>::num);
|
||||||
"The pixel type you gave doesn't match pixel used by the open cv Mat object.");
|
//DLIB_CASSERT(img.depth() == cv::DataType<typename pixel_traits<pixel_type>::basic_pixel_type>::depth &&
|
||||||
|
// img.channels() == pixel_traits<pixel_type>::num,
|
||||||
|
// "The pixel type you gave doesn't match pixel used by the open cv Mat object.");
|
||||||
IplImage temp = img;
|
IplImage temp = img;
|
||||||
init(&temp);
|
init(&temp);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue