Merge 991f6b1908 into 3cfc2be104

Some pages present flickering due to having dimensions that surpass those calculated in SubsamplingScaleImageView.

app/src/main/java/eu/kanade/domain/base/BasePreferences.kt

@@ -32,4 +32,6 @@ class BasePreferences(
     fun displayProfile() = preferenceStore.getString("pref_display_profile_key", "")
 
     fun alwaysUseSSIVToDecode() = preferenceStore.getBoolean("pref_always_use_ssiv_to_decode", false)
+
+    fun fallbackForLongStrips() = preferenceStore.getBoolean("pref_fallback_for_long_strips", false)
 }

app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsAdvancedScreen.kt

@@ -345,6 +345,10 @@ object SettingsAdvancedScreen : SearchableSettings {
                     pref = basePreferences.alwaysUseSSIVToDecode(),
                     title = stringResource(MR.strings.pref_always_use_ssiv_to_decode),
                 ),
+                Preference.PreferenceItem.SwitchPreference(
+                    pref = basePreferences.fallbackForLongStrips(),
+                    title = stringResource(MR.strings.pref_fallback_for_long_strips),
+                ),
             ),
         )
     }

app/src/main/java/eu/kanade/tachiyomi/data/coil/TachiyomiImageDecoder.kt

@@ -10,10 +10,13 @@ import coil3.decode.ImageSource
 import coil3.fetch.SourceFetchResult
 import coil3.request.Options
 import coil3.request.bitmapConfig
+import eu.kanade.domain.base.BasePreferences
 import eu.kanade.tachiyomi.util.system.GLUtil
 import okio.BufferedSource
 import tachiyomi.core.common.util.system.ImageUtil
 import tachiyomi.decoder.ImageDecoder
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 
 /**
  * A [Decoder] that uses built-in [ImageDecoder] to decode images that is not supported by the system.
@@ -27,6 +30,8 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
 
         check(decoder != null && decoder.width > 0 && decoder.height > 0) { "Failed to initialize decoder" }
 
+        val fallbackForLongStrips by lazy { Injekt.get<BasePreferences>().fallbackForLongStrips().get() }
+
         val srcWidth = decoder.width
         val srcHeight = decoder.height
 
@@ -50,10 +55,14 @@ class TachiyomiImageDecoder(private val resources: ImageSource, private val opti
             options.bitmapConfig == Bitmap.Config.HARDWARE &&
             maxOf(bitmap.width, bitmap.height) <= GLUtil.maxTextureSize
         ) {
-            val hwBitmap = bitmap.copy(Bitmap.Config.HARDWARE, false)
+            if (
-            if (hwBitmap != null) {
+                !fallbackForLongStrips || bitmap.width < dstWidth && bitmap.height*1.1 <= GLUtil.maxTextureSize
-                bitmap.recycle()
+            ) {
-                bitmap = hwBitmap
+                val hwBitmap = bitmap.copy(Bitmap.Config.HARDWARE, false)
+                if (hwBitmap != null) {
+                    bitmap.recycle()
+                    bitmap = hwBitmap
+                }
             }
         }
 

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ sqldelight = "2.0.2"
 sqlite = "2.4.0"
 voyager = "1.0.0"
 spotless = "7.0.0.BETA4"
-ktlint-core = "1.4.0"
+ktlint-core = "1.4.1"
 firebase-bom = "33.5.1"
 
 [libraries]

i18n/src/commonMain/moko-resources/base/strings.xml

@@ -393,6 +393,7 @@
     <string name="pref_show_reading_mode_summary">Briefly show current mode when reader is opened</string>
     <string name="pref_display_profile">Custom display profile</string>
     <string name="pref_always_use_ssiv_to_decode">Always use SSIV to decode long strip images</string>
+    <string name="pref_fallback_for_long_strips">Add safety checks to load vertical strips</string>
     <string name="pref_crop_borders">Crop borders</string>
     <string name="pref_custom_brightness">Custom brightness</string>
     <string name="pref_grayscale">Grayscale</string>