Skip to content

GitLab

Commit e5aeac4b authored by Davis King's avatar Davis King
Browse files

Merge

parents 98ee3bed bb352454
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
docs/docs/imaging.xml
View file @ e5aeac4b
...@@ -735,8 +735,7 @@ ...@@ -735,8 +735,7 @@
<p> <p>
Note that you can do the reverse conversion, from dlib to OpenCV, Note that you can do the reverse conversion, from dlib to OpenCV,
using the <a href="#toMat">toMat</a> routine. Also note that you using the <a href="#toMat">toMat</a> routine.
have to #include OpenCV's header before you #include dlib/opencv.h.
</p> </p>
</description> </description>
...@@ -753,8 +752,7 @@ ...@@ -753,8 +752,7 @@
This is done by setting up the Mat object to point to the same memory as the dlib image. This is done by setting up the Mat object to point to the same memory as the dlib image.
<p> <p>
Note that you can do the reverse conversion, from OpenCV to dlib, Note that you can do the reverse conversion, from OpenCV to dlib,
using the <a href="#cv_image">cv_image</a> object. Also note that you using the <a href="#cv_image">cv_image</a> object.
have to #include OpenCV's header before you #include dlib/opencv.h.
</p> </p>
</description> </description>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment