potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-28 06:43:01 +04:00
Code Packages Releases Wiki Activity
29,635 Commits 7 Branches 132 Tags
eb6d8e6af233e0c021bfae4e04f36b2b844157a8
Commit Graph

16 Commits

Author SHA1 Message Date
Alexander Alekhin a90dacdf75 android: fix javadoc 2020-01-15 19:44:27 +03:00
hannesa2 43a91f82fe Merge pull request #16222 from hannesa2:AndroidMoveVersionInfo 
Android move version info to Gradle style

* move version info to Gradle style

* Use VERSION_NAME in loader

* apply review suggestion
 2020-01-03 19:15:35 +03:00
Brian Wignall 659ffaddb4 Fix spelling typos 2019-12-26 06:45:03 -05:00
luz.paz ec43292e1e Fix modules/ typos 
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
 2019-08-15 18:02:09 -04:00
Giles Payne 2734291b35 Add CameraActivity utility class to automate Camera permission request handling 2019-07-20 13:40:10 +09:00
Alexander Alekhin f663e8f903 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-07-09 19:57:57 +00:00
Alexander Alekhin 3998b41d68 android: JavaCamera2View use calculateCameraFrameSize() method 
from CameraBridgeViewBase (common base with JavaCameraView)
 2019-07-04 21:43:09 +00:00
Alexander Alekhin 166ecaeda8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-05-23 19:50:20 +03:00
Ahmed Ashour f3319f6140 java: remove redundant declaration of java.lang package 2019-05-23 14:06:34 +02:00
Alexander Alekhin 8c0b0714e7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-11 19:20:22 +00:00
Adrian Renner 442fdfd4b2 Merge pull request #13999 from addyi:fixAndroidLintingErrors 
* fix android lint error in BaseLoaderCallback (LongLogTag)

Lint Error that was causde by the to long TAG:
BaseLoaderCallback.java:31:
Error: The logging tag can be at most 23 characters,
was 31 (OpenCVLoader/BaseLoaderCallback) [LongLogTag]
Log.e(TAG, "Package installation failed!");

* add requested "OCV" prefix for android logging
 2019-03-07 23:18:22 +03:00
Alexander Alekhin 690fb0544c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-02 14:31:05 +03:00
soonbro 9b9f38afc8 fix typo in FpsMeter.java 
'mFramesCouner' -> 'mFramesCounter'
 2018-09-29 11:36:47 +00:00
Alexander Alekhin c6aa97c9aa next(android): java3 -> java4 2018-04-10 18:09:54 +03:00
luz.paz d05714995c Misc. modules/ cont. pt2 
Found via `codespell`
 2018-02-13 11:28:11 -05:00
Alexander Alekhin 0cad2d2a83 java: files rename 
intermediate commit (to simplify code review)
 2018-01-12 19:14:00 +00:00