Play a little code golf with the FuzzyCompare function

DanielJette · DanielJette · commit ff2e49569627 · 2024-06-01T11:23:20.000-04:00
diff --git a/Library/src/main/java/dev/testify/core/processor/BitmapExtentions.kt b/Library/src/main/java/dev/testify/core/processor/BitmapExtentions.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/Library/src/main/java/dev/testify/core/processor/ParallelPixelProcessor.kt b/Library/src/main/java/dev/testify/core/processor/ParallelPixelProcessor.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -81,8 +81,6 @@ class ParallelPixelProcessor private constructor(
         ).apply {
             baselineBitmap.copyPixelsToBuffer(baselineBuffer)
             currentBitmap.copyPixelsToBuffer(currentBuffer)
-            baselineBitmap.recycle()
-            currentBitmap.recycle()
         }
     }
 
diff --git a/Library/src/main/java/dev/testify/core/processor/compare/FuzzyCompare.kt b/Library/src/main/java/dev/testify/core/processor/compare/FuzzyCompare.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Modified work copyright (c) 2022 ndtp
+ * Modified work copyright (c) 2022-2024 ndtp
  * Original work copyright (c) 2019 Shopify Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -87,18 +87,10 @@ internal class FuzzyCompare(
             .baseline(baselineBitmap)
             .current(currentBitmap)
             .analyze { baselinePixel, currentPixel, (x, y) ->
-                if (baselinePixel == currentPixel) {
-                    /* return  */ true
-                } else {
-                    var exclude = false
-                    for (rect in exclusionRects) {
-                        if (rect.contains(x, y)) {
-                            exclude = true
-                            break
-                        }
-                    }
-                    exclude || analyzePixelFunction(baselinePixel, currentPixel)
-                }
+                (baselinePixel == currentPixel) || exclusionRects.any { it.contains(x, y) } || analyzePixelFunction(
+                    baselinePixel,
+                    currentPixel
+                )
             }
     }
 }
diff --git a/Library/src/main/java/dev/testify/core/processor/diff/HighContrastDiff.kt b/Library/src/main/java/dev/testify/core/processor/diff/HighContrastDiff.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/Library/src/main/java/dev/testify/internal/helpers/ManifestHelpers.kt b/Library/src/main/java/dev/testify/internal/helpers/ManifestHelpers.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/Library/src/test/java/dev/testify/core/processor/ParallelPixelProcessorTest.kt b/Library/src/test/java/dev/testify/core/processor/ParallelPixelProcessorTest.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/Library/src/test/java/dev/testify/core/processor/compare/FuzzyCompareTest.kt b/Library/src/test/java/dev/testify/core/processor/compare/FuzzyCompareTest.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/Library/src/test/java/dev/testify/core/processor/compare/RegionCompareTest.kt b/Library/src/test/java/dev/testify/core/processor/compare/RegionCompareTest.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Modified work copyright (c) 2022 ndtp
+ * Modified work copyright (c) 2022-2024 ndtp
  * Original work copyright (c) 2020 Shopify Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/Library/src/test/java/dev/testify/core/processor/diff/HighContrastDiffTest.kt b/Library/src/test/java/dev/testify/core/processor/diff/HighContrastDiffTest.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2023 ndtp
+ * Copyright (c) 2023-2024 ndtp
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/Plugins/Gradle/src/main/kotlin/dev/testify/TestifyExtension.kt b/Plugins/Gradle/src/main/kotlin/dev/testify/TestifyExtension.kt
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Modified work copyright (c) 2022 ndtp
+ * Modified work copyright (c) 2022-2024 ndtp
  * Original work copyright (c) 2019 Shopify Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/build.gradle b/build.gradle
@@ -24,10 +24,10 @@ buildscript {
                 ],
                 'colormath'          : '1.4.1',             // https://github.com/ajalt/colormath/releases
                 'compose'            : [                    // https://developer.android.com/jetpack/androidx/releases/compose
-                                                            'compilerExt': '1.4.7',
-                                                            'core'       : '1.4.3',
-                                                            'material'   : '1.4.3',
-                                                            'ui'         : '1.4.3',
+                    'compilerExt': '1.4.7',
+                    'core'       : '1.4.3',
+                    'material'   : '1.4.3',
+                    'ui'         : '1.4.3',
                 ],
                 'dokka'              : '1.8.10',            // https://github.com/Kotlin/dokka/releases
                 'gson'               : '2.9.0',             // https://github.com/google/gson/releases

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* The MIT License (MIT)`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2023 ndtp`
	`4`	`+ * Copyright (c) 2023-2024 ndtp`
`5`	`5`	`*`
`6`	`6`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`7`	`7`	`* of this software and associated documentation files (the "Software"), to deal`