Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
71e7d444
Commit
71e7d444
authored
Dec 20, 2012
by
Alexander Smorkalov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All OpenCV Manager compiler warrnings fixed.
parent
c8b658fd
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
12 deletions
+15
-12
OpenCVEngine.cpp
android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
+2
-2
OpenCVLibraryInfo.cpp
android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
+6
-6
PackageInfo.cpp
android/service/engine/jni/NativeService/PackageInfo.cpp
+4
-4
EngineCommon.h
android/service/engine/jni/include/EngineCommon.h
+3
-0
No files found.
android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
View file @
71e7d444
...
...
@@ -130,7 +130,7 @@ android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
LOGD
(
"Trying to load info library
\"
%s
\"
"
,
tmp
.
c_str
());
void
*
handle
;
const
char
*
(
*
info_func
)()
;
InfoFunctionType
info_func
;
handle
=
dlopen
(
tmp
.
c_str
(),
RTLD_LAZY
);
if
(
handle
)
...
...
@@ -138,7 +138,7 @@ android::String16 OpenCVEngine::GetLibraryList(android::String16 version)
const
char
*
error
;
dlerror
();
*
(
void
**
)
(
&
info_func
)
=
dlsym
(
handle
,
"GetLibraryList"
);
info_func
=
(
InfoFunctionType
)
dlsym
(
handle
,
"GetLibraryList"
);
if
((
error
=
dlerror
())
==
NULL
)
{
result
=
String16
((
*
info_func
)());
...
...
android/service/engine/jni/JNIWrapper/OpenCVLibraryInfo.cpp
View file @
71e7d444
...
...
@@ -24,12 +24,12 @@ JNIEXPORT jlong JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_open
JNIEXPORT
jstring
JNICALL
Java_org_opencv_engine_OpenCVLibraryInfo_getPackageName
(
JNIEnv
*
env
,
jobject
,
jlong
handle
)
{
const
char
*
(
*
info_func
)()
;
InfoFunctionType
info_func
;
const
char
*
result
;
const
char
*
error
;
dlerror
();
*
(
void
**
)
(
&
info_func
)
=
dlsym
((
void
*
)
handle
,
"GetPackageName"
);
info_func
=
(
InfoFunctionType
)
dlsym
((
void
*
)
handle
,
"GetPackageName"
);
if
((
error
=
dlerror
())
==
NULL
)
result
=
(
*
info_func
)();
else
...
...
@@ -44,12 +44,12 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getPackageNam
JNIEXPORT
jstring
JNICALL
Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryList
(
JNIEnv
*
env
,
jobject
,
jlong
handle
)
{
const
char
*
(
*
info_func
)()
;
InfoFunctionType
info_func
;
const
char
*
result
;
const
char
*
error
;
dlerror
();
*
(
void
**
)
(
&
info_func
)
=
dlsym
((
void
*
)
handle
,
"GetLibraryList"
);
info_func
=
(
InfoFunctionType
)
dlsym
((
void
*
)
handle
,
"GetLibraryList"
);
if
((
error
=
dlerror
())
==
NULL
)
result
=
(
*
info_func
)();
else
...
...
@@ -64,12 +64,12 @@ JNIEXPORT jstring JNICALL Java_org_opencv_engine_OpenCVLibraryInfo_getLibraryLis
JNIEXPORT
jstring
JNICALL
Java_org_opencv_engine_OpenCVLibraryInfo_getVersionName
(
JNIEnv
*
env
,
jobject
,
jlong
handle
)
{
const
char
*
(
*
info_func
)()
;
InfoFunctionType
info_func
;
const
char
*
result
;
const
char
*
error
;
dlerror
();
*
(
void
**
)
(
&
info_func
)
=
dlsym
((
void
*
)
handle
,
"GetRevision"
);
info_func
=
(
InfoFunctionType
)
dlsym
((
void
*
)
handle
,
"GetRevision"
);
if
((
error
=
dlerror
())
==
NULL
)
result
=
(
*
info_func
)();
else
...
...
android/service/engine/jni/NativeService/PackageInfo.cpp
View file @
71e7d444
...
...
@@ -342,8 +342,8 @@ InstallPath(install_path)
LOGD
(
"Trying to load info library
\"
%s
\"
"
,
tmp
.
c_str
());
void
*
handle
;
const
char
*
(
*
name_func
)()
;
const
char
*
(
*
revision_func
)()
;
InfoFunctionType
name_func
;
InfoFunctionType
revision_func
;
handle
=
dlopen
(
tmp
.
c_str
(),
RTLD_LAZY
);
if
(
handle
)
...
...
@@ -351,8 +351,8 @@ InstallPath(install_path)
const
char
*
error
;
dlerror
();
*
(
void
**
)
(
&
name_func
)
=
dlsym
(
handle
,
"GetPackageName"
);
*
(
void
**
)
(
&
revision_func
)
=
dlsym
(
handle
,
"GetRevision"
);
name_func
=
(
InfoFunctionType
)
dlsym
(
handle
,
"GetPackageName"
);
revision_func
=
(
InfoFunctionType
)
dlsym
(
handle
,
"GetRevision"
);
error
=
dlerror
();
if
(
!
error
&&
revision_func
&&
name_func
)
...
...
android/service/engine/jni/include/EngineCommon.h
View file @
71e7d444
...
...
@@ -17,4 +17,6 @@
// Class name of OpenCV engine binder object. Is needned for connection to service
#define OPECV_ENGINE_CLASSNAME "org.opencv.engine.OpenCVEngineInterface"
typedef
const
char
*
(
*
InfoFunctionType
)();
#endif
\ No newline at end of file
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