From 22bbcaeed09ee3f22bb686dad8df8d598dec8ac2 Mon Sep 17 00:00:00 2001 From: len Date: Sun, 23 Oct 2016 16:42:48 +0200 Subject: [PATCH] Remove builtin decoders from Rapid --- app/build.gradle | 2 +- .../eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt | 5 +---- build.gradle | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 155f0074a7..352969657b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,7 +93,7 @@ android { dependencies { // Modified dependencies - compile 'com.github.inorichi:subsampling-scale-image-view:c3e3a87' + compile 'com.github.inorichi:subsampling-scale-image-view:a2a14ef' compile 'com.github.inorichi:ReactiveNetwork:69092ed' // Android support library diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt index 1e6667fee8..411c495198 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt @@ -201,11 +201,8 @@ abstract class BaseReader : BaseFragment() { fun setDecoderClass(value: Int) { when (value) { RAPID_DECODER -> { - // Using Skia because Rapid isn't stable. Rapid is still used for region decoding. - // https://github.com/inorichi/tachiyomi/issues/97 - //bitmapDecoderClass = RapidImageDecoder.class; regionDecoderClass = RapidImageRegionDecoder::class.java - bitmapDecoderClass = SkiaImageDecoder::class.java + bitmapDecoderClass = RapidImageDecoder::class.java } SKIA_DECODER -> { regionDecoderClass = SkiaImageRegionDecoder::class.java diff --git a/build.gradle b/build.gradle index 8cdddff216..5995e49e83 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.2' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files