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
e4377e7c
Commit
e4377e7c
authored
Mar 09, 2017
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #8335 from kuanyili:typo-patch
parents
8ef23d64
e685dcef
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
android+AsyncServiceHelper.java
...s/java/generator/src/java/android+AsyncServiceHelper.java
+3
-3
android+BaseLoaderCallback.java
...s/java/generator/src/java/android+BaseLoaderCallback.java
+1
-1
android+JavaCameraView.java
modules/java/generator/src/java/android+JavaCameraView.java
+1
-1
No files found.
modules/java/generator/src/java/android+AsyncServiceHelper.java
View file @
e4377e7c
...
...
@@ -131,7 +131,7 @@ class AsyncServiceHelper
}
public
void
cancel
()
{
Log
.
d
(
TAG
,
"Wating for OpenCV canceled by user"
);
Log
.
d
(
TAG
,
"Wa
i
ting for OpenCV canceled by user"
);
mServiceInstallationProgress
=
false
;
int
Status
=
LoaderCallbackInterface
.
INSTALL_CANCELED
;
Log
.
d
(
TAG
,
"Init finished with status "
+
Status
);
...
...
@@ -197,7 +197,7 @@ class AsyncServiceHelper
if
(
mEngineService
.
installVersion
(
mOpenCVersion
))
{
mLibraryInstallationProgress
=
true
;
Log
.
d
(
TAG
,
"Package installation sta
tr
ed"
);
Log
.
d
(
TAG
,
"Package installation sta
rt
ed"
);
Log
.
d
(
TAG
,
"Unbind from service"
);
mAppContext
.
unbindService
(
mServiceConnection
);
}
...
...
@@ -228,7 +228,7 @@ class AsyncServiceHelper
mUserAppCallback
.
onManagerConnected
(
LoaderCallbackInterface
.
INSTALL_CANCELED
);
}
public
void
wait_install
()
{
Log
.
e
(
TAG
,
"Instalation was not started! Nothing to wait!"
);
Log
.
e
(
TAG
,
"Instal
l
ation was not started! Nothing to wait!"
);
}
};
...
...
modules/java/generator/src/java/android+BaseLoaderCallback.java
View file @
e4377e7c
...
...
@@ -43,7 +43,7 @@ public abstract class BaseLoaderCallback implements LoaderCallbackInterface {
/** Package installation has been canceled. **/
case
LoaderCallbackInterface
.
INSTALL_CANCELED
:
{
Log
.
d
(
TAG
,
"OpenCV library instalation was canceled by user"
);
Log
.
d
(
TAG
,
"OpenCV library instal
l
ation was canceled by user"
);
finish
();
}
break
;
/** Application is incompatible with this version of OpenCV Manager. Possibly, a service update is required. **/
...
...
modules/java/generator/src/java/android+JavaCameraView.java
View file @
e4377e7c
...
...
@@ -275,7 +275,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
synchronized
(
this
)
{
this
.
notify
();
}
Log
.
d
(
TAG
,
"Wating for thread"
);
Log
.
d
(
TAG
,
"Wa
i
ting for thread"
);
if
(
mThread
!=
null
)
mThread
.
join
();
}
catch
(
InterruptedException
e
)
{
...
...
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