diff --git a/app/src/main/java/com/k2_9/omrekap/utils/CropHelper.kt b/app/src/main/java/com/k2_9/omrekap/utils/CropHelper.kt index b48ee52ec2e6d6f6f8825d511bace2516a6cf13d..1ff85ab9f1d9b408bcd941ce7794f09f61c50aed 100644 --- a/app/src/main/java/com/k2_9/omrekap/utils/CropHelper.kt +++ b/app/src/main/java/com/k2_9/omrekap/utils/CropHelper.kt @@ -33,7 +33,7 @@ object CropHelper { Utils.bitmapToMat(patternBitmap, cv8uc4pattern) cvtColor(cv8uc4pattern, this.pattern, COLOR_BGR2GRAY) - PreprocessHelper.preprocessPattern(this.pattern) + this.pattern = PreprocessHelper.preprocessPattern(this.pattern) } fun detectCorner(img: Mat): CornerPoints { diff --git a/app/src/main/java/com/k2_9/omrekap/utils/PreprocessHelper.kt b/app/src/main/java/com/k2_9/omrekap/utils/PreprocessHelper.kt index 997c4143e104e002b189b91250bd21ff7151976d..6858fea2f2763f3614b355552d129cb58e959607 100644 --- a/app/src/main/java/com/k2_9/omrekap/utils/PreprocessHelper.kt +++ b/app/src/main/java/com/k2_9/omrekap/utils/PreprocessHelper.kt @@ -50,27 +50,22 @@ object PreprocessHelper { } private fun preprocessMat(img: Mat): Mat { - return img.apply { - resizeMat(this) -// normalize(this) - } + return resizeMat(img) } fun preprocessPattern(img: Mat): Mat { - return img.apply { - normalize(this) - } + return normalize(img) } private fun resizeMat(img: Mat): Mat { - val resizedImg = Mat() - Imgproc.resize(img, resizedImg, Size(FINAL_WIDTH, FINAL_HEIGHT)) + val resizedImg = Mat(Size(FINAL_WIDTH, FINAL_HEIGHT), img.type()) + Imgproc.resize(img, resizedImg, Size(FINAL_WIDTH, FINAL_HEIGHT), 0.0, 0.0, Imgproc.INTER_CUBIC) return resizedImg } private fun normalize(img: Mat): Mat { val normalizedImg = Mat() - Core.normalize(img, normalizedImg) + Core.normalize(img, normalizedImg, 0.0, 255.0, Core.NORM_MINMAX) return normalizedImg } } diff --git a/app/src/main/java/com/k2_9/omrekap/views/activities/PreviewActivity.kt b/app/src/main/java/com/k2_9/omrekap/views/activities/PreviewActivity.kt index ecc6297b607c4d8e20d99f9d66a61971536ad32a..240353e7fb36bdba05d31a7b1bf4440eb645ca60 100644 --- a/app/src/main/java/com/k2_9/omrekap/views/activities/PreviewActivity.kt +++ b/app/src/main/java/com/k2_9/omrekap/views/activities/PreviewActivity.kt @@ -48,7 +48,8 @@ class PreviewActivity : AppCompatActivity() { } val bitmapOptions = BitmapFactory.Options() - bitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888 + bitmapOptions.inPreferredConfig = Bitmap.Config.ALPHA_8 + bitmapOptions.inScaled = false val cornerPatternBitmap: Bitmap = BitmapFactory.decodeResource(resources, R.raw.corner_pattern, bitmapOptions) CropHelper.loadPattern(cornerPatternBitmap)