oupson
/
Kapng-Android
mirror of https://github.com/oupson/Kapng-Android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding todo

This commit is contained in:
Oupson 2020-11-02 10:11:41 +01:00
parent 7b6fbfdf57
commit e3719dcfe0
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt
View File

@ -221,8 +221,8 @@ class ApngEncoder(
fcTL.addAll(Utils.to4Bytes(yOffsets).asList())
// Set frame delay
fcTL.addAll(Utils.to2Bytes(delay.toInt()).asList())
fcTL.addAll(Utils.to2Bytes(1000).asList())
fcTL.addAll(Utils.to2Bytes(delay.toInt().toShort()).asList())
fcTL.addAll(Utils.to2Bytes(1000.toShort()).asList())
// Add DisposeOp and BlendOp
fcTL.add(Utils.getDisposeOp(disposeOp).toByte())

4
apng_library/src/main/java/oupson/apng/encoder/ExperimentalApngEncoder.kt
View File

@ -351,8 +351,8 @@ class ExperimentalApngEncoder(
// Set frame delay
// TODO BETTER FRACTION
.plus(Utils.to2Bytes(delay.toInt()))
.plus(Utils.to2Bytes(1000))
.plus(Utils.to2Bytes(delay.toInt().toShort()))
.plus(Utils.to2Bytes(1000.toShort()))
// Add DisposeOp and BlendOp
.plus(Utils.getDisposeOp(disposeOp))

15
apng_library/src/main/java/oupson/apng/utils/Utils.kt
View File

@ -1,5 +1,11 @@
package oupson.apng.utils
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.*
import kotlin.experimental.and
class Utils {
companion object {
/**
@ -136,6 +142,7 @@ class Utils {
* @param i The int
* @return [Array] 4 Bytes
*/
// TODO RENAME
fun to4Bytes(i: Int): Array<Byte> {
return arrayOf((i shr 24).toByte(), (i shr 16).toByte(), (i shr 8).toByte(), i.toByte())
}
@ -145,6 +152,7 @@ class Utils {
* @param i The int
* @return [ByteArray] 4 Bytes
*/
// TODO RENAME
fun to4BytesArray(i: Int): ByteArray {
return byteArrayOf(
(i shr 24).toByte(),
@ -159,15 +167,22 @@ class Utils {
* @param i The int
* @return [ByteArray] 2 Bytes
*/
// TODO RENAME
fun to2Bytes(i: Int): ByteArray {
return byteArrayOf((i shr 8).toByte(), i /*>> 0*/.toByte())
}
// TODO RENAME
fun to2Bytes(s: Short): ByteArray {
return byteArrayOf((s.toInt() shr 8 and 0x00FF).toByte(), (s and 0xFF).toByte())
}
/**
* Parse the length of chunks
* [byteArray] The beginning of the chunk, containing the length
* [Int] The length of the chunk
*/
// TODO REWRITE THIS ... THING
fun parseLength(byteArray: ByteArray): Int {
var lengthString = ""
byteArray.forEach {