Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
54a9a5bb
Commit
54a9a5bb
authored
Jan 07, 2020
by
jeffeDurand
Committed by
Davis E. King
Jan 07, 2020
Browse files
Fix error for opencv 3.4.9+ over IplImage (#1949) (#1963)
parent
e4998c13
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
dlib/opencv/cv_image.h
dlib/opencv/cv_image.h
+1
-1
No files found.
dlib/opencv/cv_image.h
View file @
54a9a5bb
...
@@ -39,7 +39,7 @@ namespace dlib
...
@@ -39,7 +39,7 @@ namespace dlib
// 2.4.9.1 CV_VERSION_MAJOR==4 and CV_VERSION_EPOCH==2. However, CV_MAJOR_VERSION has always
// 2.4.9.1 CV_VERSION_MAJOR==4 and CV_VERSION_EPOCH==2. However, CV_MAJOR_VERSION has always
// (seemingly) held the actual major version number, so we use that to test for the OpenCV major
// (seemingly) held the actual major version number, so we use that to test for the OpenCV major
// version.
// version.
#if CV_MAJOR_VERSION > 3
#if CV_MAJOR_VERSION > 3
|| (CV_MAJOR_VERSION == 3 && CV_SUBMINOR_VERSION >= 9)
IplImage
temp
=
cvIplImage
(
img
);
IplImage
temp
=
cvIplImage
(
img
);
#else
#else
IplImage
temp
=
img
;
IplImage
temp
=
img
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment