Skip to content

Commit 140b950

Browse files
committed
Remove inpaint (not great results)
1 parent ed513d3 commit 140b950

File tree

2 files changed

+3
-34
lines changed

2 files changed

+3
-34
lines changed

app/src/main/java/com/dan/perspective/MainFragment.kt

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ import org.opencv.core.Core.mean
1818
import org.opencv.core.Core.minMaxLoc
1919
import org.opencv.core.CvType.*
2020
import org.opencv.core.Mat
21-
import org.opencv.core.Scalar
2221
import org.opencv.core.Size
2322
import org.opencv.imgproc.Imgproc.*
24-
import org.opencv.xphoto.Xphoto
2523
import java.io.File
2624
import kotlin.math.PI
2725
import kotlin.math.abs
@@ -191,7 +189,6 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
191189
binding.radioButtonPointDirectionAll.isEnabled = enabled
192190
binding.radioButtonPointDirectionHorizontal.isEnabled = enabled
193191
binding.radioButtonPointDirectionVertical.isEnabled = enabled
194-
binding.checkBoxInpaint.isEnabled = enabled
195192

196193
menuSave?.isEnabled = enabled
197194
menuPrevPerspective?.isEnabled = enabled && settings.prevHeight > 0
@@ -215,7 +212,7 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
215212
private fun saveImageAsync() {
216213
if (inputImage.empty()) return
217214

218-
warpImageAsync( binding.checkBoxInpaint.isChecked )
215+
warpImageAsync()
219216
if (outputImage.empty()) return
220217
val bitmap = matToBitmap(outputImage) ?: return
221218

@@ -282,7 +279,7 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
282279
}
283280
}
284281

285-
private fun warpImageAsync( inpaint: Boolean ) {
282+
private fun warpImageAsync() {
286283
if (inputImage.empty()) return
287284
if (!outputImage.empty()) return
288285

@@ -315,14 +312,6 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
315312

316313
val perspectiveMat = getPerspectiveTransform(srcMat, destMat)
317314
warpPerspective(inputImage, outputImage, perspectiveMat, inputImage.size(), INTER_LANCZOS4)
318-
319-
if (inpaint) {
320-
val tmpMat = Mat(inputImage.width(), inputImage.height(), CV_8UC1, Scalar(255.0))
321-
val warpedMask = Mat()
322-
warpPerspective(tmpMat, warpedMask, perspectiveMat, inputImage.size(), INTER_NEAREST)
323-
Xphoto.inpaint( outputImage, warpedMask, tmpMat, Xphoto.INPAINT_SHIFTMAP )
324-
outputImage = tmpMat
325-
}
326315
}
327316

328317
private fun showPreview() {
@@ -341,10 +330,8 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
341330
return
342331
}
343332

344-
val inpaint = binding.checkBoxInpaint.isChecked
345-
346333
runAsync(MSG_WARP) {
347-
warpImageAsync(inpaint)
334+
warpImageAsync()
348335
showPreview()
349336
}
350337
}
@@ -528,10 +515,6 @@ class MainFragment(activity: MainActivity) : AppFragment(activity) {
528515

529516
updateButtons()
530517

531-
binding.checkBoxInpaint.setOnCheckedChangeListener { _, _ ->
532-
clearOutputImage()
533-
}
534-
535518
binding.buttonReset.setOnClickListener {
536519
binding.imageEdit.resetPoints()
537520
}

app/src/main/res/layout/main_fragment.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,6 @@
5151
android:textAllCaps="false" />
5252
</LinearLayout>
5353

54-
<LinearLayout
55-
android:layout_width="match_parent"
56-
android:layout_height="wrap_content"
57-
android:orientation="horizontal">
58-
59-
<CheckBox
60-
android:id="@+id/checkBoxInpaint"
61-
android:layout_width="wrap_content"
62-
android:layout_height="wrap_content"
63-
android:layout_weight="1"
64-
android:text="Inpaint" />
65-
66-
</LinearLayout>
67-
6854
<LinearLayout
6955
android:layout_width="wrap_content"
7056
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)