Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mvBlueFOX3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
drivers
mvBlueFOX3
Commits
31a26ff9
Commit
31a26ff9
authored
8 years ago
by
Angel Santamaria-Navarro
Browse files
Options
Downloads
Patches
Plain Diff
working with opencv3.0. ROS indigo has problems with it...trying top set compatibility with opencv2
parent
e37ccb29
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
src/mvbluefox3.cpp
+2
-2
2 additions, 2 deletions
src/mvbluefox3.cpp
src/mvbluefox3.h
+7
-7
7 additions, 7 deletions
src/mvbluefox3.h
with
10 additions
and
10 deletions
src/CMakeLists.txt
+
1
−
1
View file @
31a26ff9
...
...
@@ -44,7 +44,7 @@ ADD_LIBRARY(mvbluefox3 SHARED ${sources} ${sources_ex} ${sources_mut})
#if CV then add the libraries
if
(
USE_CV
)
INCLUDE_DIRECTORIES
(
${
OpenCV_INCLUDE_DIRS
}
)
TARGET_LINK_LIBRARIES
(
mvbluefox3
${
mvIMPACT_LIBRARY
}
${
OpenCV_LIBS
}
)
TARGET_LINK_LIBRARIES
(
mvbluefox3
${
mvIMPACT_LIBRARY
}
${
OpenCV_LIB
RARIE
S
}
)
else
(
USE_CV
)
TARGET_LINK_LIBRARIES
(
mvbluefox3
${
mvIMPACT_LIBRARY
}
)
endif
(
USE_CV
)
...
...
This diff is collapsed.
Click to expand it.
src/mvbluefox3.cpp
+
2
−
2
View file @
31a26ff9
...
...
@@ -229,8 +229,8 @@ void CMvbluefox3::GetImageCV(cv::Mat &image)
"Invalid depth. OpenCV Depth not implemented here."
);
break
;
}
cv
::
Mat
image
2
=
cv
::
Mat
(
this
->
params_
.
height
,
this
->
params_
.
width
,
type
,
image_raw
);
image
=
image2
.
clone
();
image
=
cv
::
Mat
(
this
->
params_
.
height
,
this
->
params_
.
width
,
type
,
image_raw
);
delete
[]
image_raw
;
}
#endif
...
...
This diff is collapsed.
Click to expand it.
src/mvbluefox3.h
+
7
−
7
View file @
31a26ff9
...
...
@@ -189,13 +189,6 @@ class CMvbluefox3
*/
void
OpenDevice
(
const
std
::
string
&
serial
);
/**
* \brief Close device
*
* Close device.
*/
void
CloseDevice
(
void
);
/**
* \brief Get image request format
*
...
...
@@ -384,6 +377,13 @@ class CMvbluefox3
*/
~
CMvbluefox3
();
/**
* \brief Close device
*
* Close device.
*/
void
CloseDevice
(
void
);
/**
* \brief Get device product name
*
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment