ZF/OpenFace
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/ope/OpenFace.git synced 2026-05-13 02:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Getting rid of compiler warnings.

Browse Source
This commit is contained in:
Tadas Baltrusaitis
2016-08-14 10:20:07 -04:00
parent 4c2e0bd9a0
commit ef15d5c2cd
4 changed files with 834 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1646
lib/3rdParty/dlib/include/dlib/general_hash/random_hashing.h vendored
View File

File diff suppressed because it is too large Load Diff

7
lib/3rdParty/dlib/include/dlib/matrix/matrix.h vendored
View File

@@ -1595,9 +1595,10 @@ namespace dlib
explicit literal_assign_helper(matrix* m_): m(m_), r(0), c(0),has_been_used(false) {next();}
~literal_assign_helper()
{
DLIB_CASSERT(!has_been_used || r == m->nr(),
"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");
assert(!has_been_used || r == m->nr());
//DLIB_CASSERT(!has_been_used || r == m->nr(),
// "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, (

8
lib/3rdParty/dlib/include/dlib/opencv/cv_image.h vendored
View File

@@ -23,9 +23,11 @@ namespace dlib
cv_image (const cv::Mat img)
{
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.");
assert(img.depth() == cv::DataType<typename pixel_traits<pixel_type>::basic_pixel_type>::depth &&
img.channels() == pixel_traits<pixel_type>::num);
//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;
init(&temp);
}