From 33132e598236b34271e647c0dfb81b12f661fda2 Mon Sep 17 00:00:00 2001
From: Oupson <oupson1er@gmail.com>
Date: Sat, 6 Feb 2021 15:27:03 +0100
Subject: [PATCH] Moving function

---
 .../apng/ApngEncoderInstrumentedTest.kt       |  4 +-
 .../java/oupson/apng/encoder/ApngEncoder.kt   | 46 ------------------
 .../src/main/java/oupson/apng/utils/Utils.kt  | 48 +++++++++++++++++++
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/apng_library/src/androidTest/java/oupson/apng/ApngEncoderInstrumentedTest.kt b/apng_library/src/androidTest/java/oupson/apng/ApngEncoderInstrumentedTest.kt
index 26c0483..1f01a20 100644
--- a/apng_library/src/androidTest/java/oupson/apng/ApngEncoderInstrumentedTest.kt
+++ b/apng_library/src/androidTest/java/oupson/apng/ApngEncoderInstrumentedTest.kt
@@ -7,7 +7,7 @@ import android.graphics.Color
 import androidx.test.platform.app.InstrumentationRegistry
 import junit.framework.TestCase.assertTrue
 import org.junit.Test
-import oupson.apng.encoder.ApngEncoder
+import oupson.apng.utils.Utils
 
 
 class ApngEncoderInstrumentedTest {
@@ -18,7 +18,7 @@ class ApngEncoderInstrumentedTest {
         val frame1 = getFrame(context, "bunny/frame_apngframe01.png")
         val frame2 = getFrame(context, "bunny/frame_apngframe02.png")
 
-        val diff = ApngEncoder.getDiffBitmap(frame1, frame2)
+        val diff = Utils.getDiffBitmap(frame1, frame2)
 
         assertTrue(isSimilar(frame1, frame2, diff))
     }
diff --git a/apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt b/apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt
index 97b3bd2..3a7500c 100644
--- a/apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt
+++ b/apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt
@@ -2,7 +2,6 @@ package oupson.apng.encoder
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.Color
 import android.util.Log
 import oupson.apng.exceptions.InvalidFrameSizeException
 import oupson.apng.utils.Utils
@@ -52,51 +51,6 @@ class ApngEncoder(
 
         /** Constants for filter (LAST)  */
         const val FILTER_LAST = 2
-
-        /**
-         *
-         */
-        fun getDiffBitmap(bitmapBuffer : Bitmap, btm : Bitmap) : Triple<Bitmap, Int, Int> { // TODO BLEND / DISPOSE OP
-            if (bitmapBuffer.width < btm.width || bitmapBuffer.height < btm.height) {
-                TODO("EXCEPTION BAD IMAGE SIZE")
-            }
-
-            var resultBtm = Bitmap.createBitmap(btm.width, btm.height, Bitmap.Config.ARGB_8888)
-
-            var offsetX = resultBtm.width + 1
-            var offsetY = resultBtm.height + 1
-
-            var lastX = 0
-            var lastY = 0
-
-            for (y in 0 until btm.height) {
-                for (x in 0 until btm.width) {
-                    if (bitmapBuffer.getPixel(x, y) == btm.getPixel(x, y)) {
-                        resultBtm.setPixel(x, y, Color.TRANSPARENT)
-                    } else {
-                        resultBtm.setPixel(x, y, btm.getPixel(x, y))
-                        if (x < offsetX)
-                            offsetX = x
-                        if (y < offsetY)
-                            offsetY = y
-                        if (x > lastX)
-                            lastX = x
-                        if (y > lastY)
-                            lastY = y
-                    }
-                }
-            }
-
-            lastX++
-            lastY++
-
-            val newWidth = lastX - offsetX
-            val newHeight = lastY - offsetY
-
-            resultBtm = Bitmap.createBitmap(resultBtm, offsetX, offsetY, newWidth, newHeight)
-
-            return Triple(resultBtm, offsetX, offsetY)
-        }
     }
 
     /** Current Frame.  **/
diff --git a/apng_library/src/main/java/oupson/apng/utils/Utils.kt b/apng_library/src/main/java/oupson/apng/utils/Utils.kt
index d70d0e0..cf4a0d2 100644
--- a/apng_library/src/main/java/oupson/apng/utils/Utils.kt
+++ b/apng_library/src/main/java/oupson/apng/utils/Utils.kt
@@ -1,5 +1,7 @@
 package oupson.apng.utils
 
+import android.graphics.Bitmap
+import android.graphics.Color
 import oupson.apng.utils.Utils.Companion.BlendOp.APNG_BLEND_OP_OVER
 import oupson.apng.utils.Utils.Companion.BlendOp.APNG_BLEND_OP_SOURCE
 import oupson.apng.utils.Utils.Companion.DisposeOp.*
@@ -205,5 +207,51 @@ class Utils {
         val tnrs: ByteArray by lazy { byteArrayOf(0x74, 0x52, 0x4e, 0x53) }
         val IHDR: ByteArray by lazy { byteArrayOf(0x49, 0x48, 0x44, 0x52) }
         val acTL: ByteArray by lazy { byteArrayOf(0x61, 0x63, 0x54, 0x4c) }
+
+        /**
+         *
+         */
+        // TODO DOC
+        fun getDiffBitmap(bitmapBuffer : Bitmap, btm : Bitmap) : Triple<Bitmap, Int, Int> { // TODO BLEND / DISPOSE OP
+            if (bitmapBuffer.width < btm.width || bitmapBuffer.height < btm.height) {
+                TODO("EXCEPTION BAD IMAGE SIZE")
+            }
+
+            var resultBtm = Bitmap.createBitmap(btm.width, btm.height, Bitmap.Config.ARGB_8888)
+
+            var offsetX = resultBtm.width + 1
+            var offsetY = resultBtm.height + 1
+
+            var lastX = 0
+            var lastY = 0
+
+            for (y in 0 until btm.height) {
+                for (x in 0 until btm.width) {
+                    if (bitmapBuffer.getPixel(x, y) == btm.getPixel(x, y)) {
+                        resultBtm.setPixel(x, y, Color.TRANSPARENT)
+                    } else {
+                        resultBtm.setPixel(x, y, btm.getPixel(x, y))
+                        if (x < offsetX)
+                            offsetX = x
+                        if (y < offsetY)
+                            offsetY = y
+                        if (x > lastX)
+                            lastX = x
+                        if (y > lastY)
+                            lastY = y
+                    }
+                }
+            }
+
+            lastX++
+            lastY++
+
+            val newWidth = lastX - offsetX
+            val newHeight = lastY - offsetY
+
+            resultBtm = Bitmap.createBitmap(resultBtm, offsetX, offsetY, newWidth, newHeight)
+
+            return Triple(resultBtm, offsetX, offsetY)
+        }
     }
 }
\ No newline at end of file