Disable StaticImageDecoder if ExifOrientationPolicy is IGNORE. (#1992)

coil-kt · Jan 2, 2024 · 76746e4 · 76746e4
1 parent 4790263
commit 76746e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/coil-core/src/androidMain/kotlin/coil3/RealImageLoader.kt b/coil-core/src/androidMain/kotlin/coil3/RealImageLoader.kt
@@ -2,6 +2,7 @@ package coil3
 
 import android.os.Build.VERSION.SDK_INT
 import coil3.decode.BitmapFactoryDecoder
+import coil3.decode.ExifOrientationPolicy.IGNORE
 import coil3.decode.StaticImageDecoderDecoder
 import coil3.fetch.AssetUriFetcher
 import coil3.fetch.BitmapFetcher
@@ -85,7 +86,7 @@ internal actual fun ComponentRegistry.Builder.addAndroidComponents(
         .apply {
             // Require API 29 for ImageDecoder support as API 28 has framework bugs:
             // https://github.com/element-hq/element-android/pull/7184
-            if (SDK_INT >= 29) {
+            if (SDK_INT >= 29 && options.bitmapFactoryExifOrientationPolicy != IGNORE) {
                 add(
                     StaticImageDecoderDecoder.Factory(
                         maxParallelism = options.bitmapFactoryMaxParallelism,

diff --git a/coil-core/src/androidMain/kotlin/coil3/decode/ExifOrientationPolicy.kt b/coil-core/src/androidMain/kotlin/coil3/decode/ExifOrientationPolicy.kt
@@ -1,6 +1,7 @@
 package coil3.decode
 
 import coil3.ImageLoader
+import coil3.bitmapFactoryExifOrientationPolicy
 
 /**
  * Specifies the policy for handling the EXIF orientation flag.

diff --git a/coil-core/src/jvmCommonMain/kotlin/coil3/decode/ImageSource.kt b/coil-core/src/jvmCommonMain/kotlin/coil3/decode/ImageSource.kt
@@ -4,9 +4,9 @@ import coil3.annotation.ExperimentalCoilApi
 import java.nio.ByteBuffer
 
 /**
- * Metadata containing the [bytebuffer] of a ByteBuffer, maybe direct
+ * Metadata containing the underlying [ByteBuffer] of the [ImageSource].
  */
 @ExperimentalCoilApi
 class ByteBufferMetadata(
-    val byteBuffer: ByteBuffer
+    val byteBuffer: ByteBuffer,
 ) : ImageSource.Metadata()