Skip to content

Commit a57e4e0

Browse files
Merge pull request #3 from michaeltroger/dev
Update opencv
2 parents 6cb527c + 8fbd567 commit a57e4e0

File tree

952 files changed

+713131
-17959
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

952 files changed

+713131
-17959
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Augmented Reality simple shape detector using OpenCV for >= Android 4.0 #
2-
Attention: This app was created in 2016. I was a beginner to Android development back then.
2+
Attention: This app was created in 2016. I was a beginner to Android development and Computer Vision back then.
33
So don't expect a perfect code please. In 2021 I updated the project to build with the latest Android Studio (2020.3.1), updated most dependencies and converted it to Kotlin, while the business logic remained unchanged.
44

55
<img src="/shapedetection.png" alt="Augmented Reality shape detection" width="400px"/>
@@ -12,7 +12,7 @@ So don't expect a perfect code please. In 2021 I updated the project to build wi
1212

1313
* IDE: Android Studio (tested with 2020.3.1)
1414
* Android SDK
15-
* Dependencies: OpenCV 3.0.0 library (included)
15+
* Dependencies: OpenCV 3 library (included) [License](/opencv-3-4-15/LICENSE)
1616
* Images location: res/drawable | Sounds location: res/raw
1717
* Mode (label/image): Flag in MainActivity (default labels)
1818
* Mode (all colors / red only): Flag in MainActivity (default all colors)

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
implementation 'androidx.activity:activity-ktx:1.3.1'
3333
implementation 'androidx.appcompat:appcompat:1.3.1'
3434
implementation 'com.google.android.material:material:1.4.0'
35-
implementation project(':openCVLibrary300')
35+
implementation project(':opencv-3-4-15')
3636

3737
testImplementation 'junit:junit:4.13.2'
3838
}

openCVLibrary300/build.gradle

Lines changed: 0 additions & 18 deletions
This file was deleted.

openCVLibrary300/src/main/AndroidManifest.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

openCVLibrary300/src/main/java/org/opencv/calib3d/Calib3d.java

Lines changed: 0 additions & 1312 deletions
This file was deleted.

openCVLibrary300/src/main/java/org/opencv/calib3d/StereoBM.java

Lines changed: 0 additions & 330 deletions
This file was deleted.

0 commit comments

Comments
 (0)