Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
seo young Joung
opencv
Commits
b94963d3
Commit
b94963d3
authored
11 years ago
by
Roman Donchenko
Committed by
OpenCV Buildbot
11 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #2052 from SpecLad:seporate
parents
24be7b26
83fe2f3b
4.x
2.4
3.4
5.x
master
next
4.5.5
4.5.4
4.5.3
4.5.3-openvino
4.5.3-openvino-2021.4.2
4.5.3-openvino-2021.4.1
4.5.2
4.5.2-openvino
4.5.1
4.5.1-openvino
4.5.0
4.5.0-openvino
4.4.0
4.4.0-openvino
4.3.0
4.3.0-openvino
4.3.0-openvino-2020.3.0
4.2.0
4.2.0-openvino
4.1.2
4.1.2-openvino
4.1.1
4.1.1-openvino
4.1.0
4.1.0-openvino
4.0.1
4.0.1-openvino
4.0.0
4.0.0-rc
4.0.0-openvino
4.0.0-beta
4.0.0-alpha
3.4.17
3.4.16
3.4.15
3.4.14
3.4.13
3.4.12
3.4.11
3.4.10
3.4.9
3.4.8
3.4.7
3.4.6
3.4.5
3.4.4
3.4.3
3.4.3-openvino
3.4.2
3.4.2-openvino
3.4.1
3.4.1-cvsdk
3.4.0
3.4.0-rc
3.3.1
3.3.1-cvsdk
3.3.0
3.3.0-rc
3.3.0-cvsdk
3.2.0
3.2.0-rc
3.1.0
3.0.0
3.0.0-rc1
3.0.0-beta
3.0.0-alpha
3.0-ocl-tp2
3.0-ocl-tech-preview
2.4.13.7
2.4.13.6
2.4.13.5
2.4.13.4
2.4.13.3
2.4.13.2
2.4.13.1
2.4.13
2.4.12.3
2.4.12.2
2.4.12.1
2.4.12
2.4.11
2.4.10.4
2.4.10.3
2.4.10.2
2.4.10.1
2.4.10
2.4.9.1
2.4.9
2.4.8.3
2.4.8.2
2.4.8.1
2.4.8
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
cmake/OpenCVGenAndroidMK.cmake
+1
-1
cmake/OpenCVGenAndroidMK.cmake
platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp
+17
-17
...ndroid/service/engine/jni/BinderComponent/StringUtils.cpp
platforms/android/service/engine/jni/BinderComponent/StringUtils.h
+2
-2
.../android/service/engine/jni/BinderComponent/StringUtils.h
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
+1
-1
.../android/service/engine/jni/NativeService/PackageInfo.cpp
platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
+1
-1
...android/service/engine/jni/Tests/PackageManagmentTest.cpp
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
+2
-2
...e/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
with
24 additions
and
24 deletions
+24
-24
cmake/OpenCVGenAndroidMK.cmake
View file @
b94963d3
...
...
@@ -54,7 +54,7 @@ if(ANDROID)
endforeach
()
# remove CUDA runtime and NPP from regular deps
# it can be added sep
o
rately if needed.
# it can be added sep
a
rately if needed.
ocv_list_filterout
(
OPENCV_EXTRA_COMPONENTS_CONFIGMAKE
"libcu"
)
ocv_list_filterout
(
OPENCV_EXTRA_COMPONENTS_CONFIGMAKE
"libnpp"
)
...
...
This diff is collapsed.
Click to expand it.
platforms/android/service/engine/jni/BinderComponent/StringUtils.cpp
View file @
b94963d3
...
...
@@ -34,13 +34,13 @@ bool ParseString(const string& src, string& key, string& value)
if
(
src
.
empty
())
return
false
;
// find sep
o
rator ":"
size_t
sep
o
rator_pos
=
src
.
find
(
":"
);
if
(
string
::
npos
!=
sep
o
rator_pos
)
// find sep
a
rator ":"
size_t
sep
a
rator_pos
=
src
.
find
(
":"
);
if
(
string
::
npos
!=
sep
a
rator_pos
)
{
key
=
src
.
substr
(
0
,
sep
o
rator_pos
);
key
=
src
.
substr
(
0
,
sep
a
rator_pos
);
StripString
(
key
);
value
=
src
.
substr
(
sep
o
rator_pos
+
1
);
value
=
src
.
substr
(
sep
a
rator_pos
+
1
);
StripString
(
value
);
return
true
;
}
...
...
@@ -50,42 +50,42 @@ bool ParseString(const string& src, string& key, string& value)
}
}
set
<
string
>
SplitString
(
const
string
&
src
,
const
char
sep
o
rator
)
set
<
string
>
SplitString
(
const
string
&
src
,
const
char
sep
a
rator
)
{
set
<
string
>
result
;
if
(
!
src
.
empty
())
{
size_t
sep
o
rator_pos
;
size_t
sep
a
rator_pos
;
size_t
prev_pos
=
0
;
do
{
sep
o
rator_pos
=
src
.
find
(
sep
o
rator
,
prev_pos
);
result
.
insert
(
src
.
substr
(
prev_pos
,
sep
o
rator_pos
-
prev_pos
));
prev_pos
=
sep
o
rator_pos
+
1
;
sep
a
rator_pos
=
src
.
find
(
sep
a
rator
,
prev_pos
);
result
.
insert
(
src
.
substr
(
prev_pos
,
sep
a
rator_pos
-
prev_pos
));
prev_pos
=
sep
a
rator_pos
+
1
;
}
while
(
string
::
npos
!=
sep
o
rator_pos
);
while
(
string
::
npos
!=
sep
a
rator_pos
);
}
return
result
;
}
vector
<
string
>
SplitStringVector
(
const
string
&
src
,
const
char
sep
o
rator
)
vector
<
string
>
SplitStringVector
(
const
string
&
src
,
const
char
sep
a
rator
)
{
vector
<
string
>
result
;
if
(
!
src
.
empty
())
{
size_t
sep
o
rator_pos
;
size_t
sep
a
rator_pos
;
size_t
prev_pos
=
0
;
do
{
sep
o
rator_pos
=
src
.
find
(
sep
o
rator
,
prev_pos
);
string
tmp
=
src
.
substr
(
prev_pos
,
sep
o
rator_pos
-
prev_pos
);
sep
a
rator_pos
=
src
.
find
(
sep
a
rator
,
prev_pos
);
string
tmp
=
src
.
substr
(
prev_pos
,
sep
a
rator_pos
-
prev_pos
);
result
.
push_back
(
tmp
);
prev_pos
=
sep
o
rator_pos
+
1
;
prev_pos
=
sep
a
rator_pos
+
1
;
}
while
(
string
::
npos
!=
sep
o
rator_pos
);
while
(
string
::
npos
!=
sep
a
rator_pos
);
}
return
result
;
...
...
This diff is collapsed.
Click to expand it.
platforms/android/service/engine/jni/BinderComponent/StringUtils.h
View file @
b94963d3
...
...
@@ -6,8 +6,8 @@
#include <vector>
bool
StripString
(
std
::
string
&
src
);
std
::
set
<
std
::
string
>
SplitString
(
const
std
::
string
&
src
,
const
char
sep
o
rator
);
std
::
set
<
std
::
string
>
SplitString
(
const
std
::
string
&
src
,
const
char
sep
a
rator
);
bool
ParseString
(
const
std
::
string
&
src
,
std
::
string
&
key
,
std
::
string
&
value
);
std
::
vector
<
std
::
string
>
SplitStringVector
(
const
std
::
string
&
src
,
const
char
sep
o
rator
);
std
::
vector
<
std
::
string
>
SplitStringVector
(
const
std
::
string
&
src
,
const
char
sep
a
rator
);
#endif
This diff is collapsed.
Click to expand it.
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
View file @
b94963d3
...
...
@@ -203,7 +203,7 @@ inline int SplitPlatform(const vector<string>& features)
}
/* Package naming convention
* All parts of package name sep
o
rated by "_" symbol
* All parts of package name sep
a
rated by "_" symbol
* First part is base namespace.
* Second part is version. Version starts from "v" symbol. After "v" symbol version nomber without dot symbol added.
* If platform is known third part is platform name
...
...
This diff is collapsed.
Click to expand it.
platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
View file @
b94963d3
...
...
@@ -144,7 +144,7 @@ TEST(PackageManager, GetPackagePathForMips)
}
#endif
// TODO: Enable tests if sep
o
rate package will be exists
// TODO: Enable tests if sep
a
rate package will be exists
// TEST(PackageManager, GetPackagePathForTegra2)
// {
// PackageManagerStub pm;
...
...
This diff is collapsed.
Click to expand it.
platforms/android/service/engine/src/org/opencv/engine/OpenCVEngineInterface.aidl
View file @
b94963d3
...
...
@@ -25,9 +25,9 @@ interface OpenCVEngineInterface
boolean
installVersion
(
String
version
);
/**
*
Return
list
of
libraries
in
loading
order
sep
o
rated
by
";"
symbol
*
Return
list
of
libraries
in
loading
order
sep
a
rated
by
";"
symbol
*
@
param
OpenCV
version
*
@
return
Returns
OpenCV
libraries
names
sep
o
rated
by
symbol
";"
in
loading
order
*
@
return
Returns
OpenCV
libraries
names
sep
a
rated
by
symbol
";"
in
loading
order
*/
String
getLibraryList
(
String
version
);
}
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help