yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix animated image detection (#5826)

Browse Source
This commit is contained in:
Ivan Iskandar 2021-09-01 04:43:29 +07:00 committed by GitHub
parent ab036312a4
commit bd033db84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
View File

@ -264,17 +264,17 @@ class PagerPageHolder(
.fromCallable { .fromCallable {
val stream = streamFn().buffered(16) val stream = streamFn().buffered(16)
val itemStream = process(item, stream) val itemStream = process(item, stream)
val bais = ByteArrayInputStream(itemStream.readBytes())
try { try {
val streamBytes = itemStream.readBytes() val isAnimated = ImageUtil.isAnimatedAndSupported(bais)
val isAnimated = ImageUtil.isAnimatedAndSupported(stream) bais.reset()
val background = if (!isAnimated && viewer.config.automaticBackground) { val background = if (!isAnimated && viewer.config.automaticBackground) {
ByteArrayInputStream(streamBytes).use { bais ->
ImageUtil.chooseBackground(context, bais) ImageUtil.chooseBackground(context, bais)
}
} else { } else {
null null
} }
Triple(streamBytes, isAnimated, background) bais.reset()
Triple(bais, isAnimated, background)
} finally { } finally {
stream.close() stream.close()
itemStream.close() itemStream.close()
@ -282,15 +282,15 @@ class PagerPageHolder(
} }
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.doOnNext { (streamBytes, isAnimated, background) -> .doOnNext { (bais, isAnimated, background) ->
ByteArrayInputStream(streamBytes).use { bais -> bais.use {
if (!isAnimated) { if (!isAnimated) {
this.background = background this.background = background
initSubsamplingImageView().apply { initSubsamplingImageView().apply {
setImage(ImageSource.inputStream(bais)) setImage(ImageSource.inputStream(it))
} }
} else { } else {
initImageView().setImage(bais) initImageView().setImage(it)
} }
} }
} }