From f80c395174938fb5847ab942d93c88f849effaf5 Mon Sep 17 00:00:00 2001 From: Oupson Date: Sun, 6 Dec 2020 19:22:05 +0100 Subject: [PATCH] Remove useless string conversion. Update gradle --- apng_library/src/main/java/oupson/apng/chunks/fcTL.kt | 4 ++-- apng_library/src/main/java/oupson/apng/utils/Utils.kt | 1 - build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apng_library/src/main/java/oupson/apng/chunks/fcTL.kt b/apng_library/src/main/java/oupson/apng/chunks/fcTL.kt index 7858c7e..4df7670 100644 --- a/apng_library/src/main/java/oupson/apng/chunks/fcTL.kt +++ b/apng_library/src/main/java/oupson/apng/chunks/fcTL.kt @@ -54,8 +54,8 @@ class fcTL : Chunk { xOffset = Utils.uIntFromBytesBigEndian(byteArray.copyOfRange(i + 16, i + 20).map(Byte::toInt)) yOffset = Utils.uIntFromBytesBigEndian(byteArray.copyOfRange(i + 20, i + 24).map(Byte::toInt)) body = byteArray.copyOfRange(i + 4, i + bodySize + 4) - blendOp = getBlendOp(String.format("%02x", byteArray[33]).toLong(16).toInt()) - disposeOp = getDisposeOp(String.format("%02x", byteArray[32]).toLong(16).toInt()) + blendOp = getBlendOp(byteArray[33].toInt()) + disposeOp = getDisposeOp(byteArray[32].toInt()) } } } \ No newline at end of file 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 6c650af..12c8bdd 100644 --- a/apng_library/src/main/java/oupson/apng/utils/Utils.kt +++ b/apng_library/src/main/java/oupson/apng/utils/Utils.kt @@ -181,7 +181,6 @@ class Utils { * [bytes] The bytes, in big endian order * [Int] The parsed int */ - // TODO CHECK IF THERE IS NO SHITTY STRING CONVERSION INSTEAD OF USING THIS FUNCTION fun uIntFromBytesBigEndian(bytes: List): Int = ((bytes[0] and 0xFF) shl 24) or ((bytes[1] and 0xFF) shl 16) or diff --git a/build.gradle b/build.gradle index f0dbe08..a14454d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e41ef71..30118f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jun 16 22:41:01 CEST 2020 +#Sun Dec 06 19:15:59 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip