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
ee35263e
Commit
ee35263e
authored
Jan 07, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10537 from pnemonic78:master_false
parents
e3a6d749
84596bff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
android+AsyncServiceHelper.java
...s/java/generator/src/java/android+AsyncServiceHelper.java
+2
-2
android+StaticHelper.java
modules/java/generator/src/java/android+StaticHelper.java
+2
-2
No files found.
modules/java/generator/src/java/android+AsyncServiceHelper.java
View file @
ee35263e
...
...
@@ -351,7 +351,7 @@ class AsyncServiceHelper
{
Log
.
d
(
TAG
,
"Cannot load library \""
+
AbsPath
+
"\""
);
e
.
printStackTrace
();
result
&
=
false
;
result
=
false
;
}
return
result
;
...
...
@@ -377,7 +377,7 @@ class AsyncServiceHelper
{
// If the dependencies list is not defined or empty.
String
AbsLibraryPath
=
Path
+
File
.
separator
+
"libopencv_java3.so"
;
result
&
=
loadLibrary
(
AbsLibraryPath
);
result
=
loadLibrary
(
AbsLibraryPath
);
}
return
result
;
...
...
modules/java/generator/src/java/android+StaticHelper.java
View file @
ee35263e
...
...
@@ -68,7 +68,7 @@ class StaticHelper {
{
Log
.
d
(
TAG
,
"Cannot load library \""
+
Name
+
"\""
);
e
.
printStackTrace
();
result
&
=
false
;
result
=
false
;
}
return
result
;
...
...
@@ -92,7 +92,7 @@ class StaticHelper {
else
{
// If dependencies list is not defined or empty.
result
&
=
loadLibrary
(
"opencv_java3"
);
result
=
loadLibrary
(
"opencv_java3"
);
}
return
result
;
...
...
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