Fix tests.

coil-kt · Nov 18, 2024 · 86fc230 · 86fc230
1 parent fcc1daa
commit 86fc230
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/coil-core/src/commonMain/kotlin/coil3/intercept/EngineInterceptor.kt b/coil-core/src/commonMain/kotlin/coil3/intercept/EngineInterceptor.kt
@@ -244,7 +244,7 @@ internal suspend fun transform(
 
     // Skip the transformations as converting to a bitmap is disabled.
     val image = result.image
-    if (image is BitmapImage && !request.allowConversionToBitmap) {
+    if (image !is BitmapImage && !request.allowConversionToBitmap) {
         logger?.log(TAG, Logger.Level.Info) {
             val type = result.image::class.simpleName
             "allowConversionToBitmap=false, skipping transformations for type $type."

diff --git a/coil-core/src/nonAndroidMain/kotlin/coil3/intercept/EngineInterceptor.nonAndroid.kt b/coil-core/src/nonAndroidMain/kotlin/coil3/intercept/EngineInterceptor.nonAndroid.kt
@@ -15,12 +15,12 @@ internal actual fun convertImageToBitmap(
 ): Bitmap {
     if (image is BitmapImage) {
         return image.bitmap
-    } else {
-        error(
-            "Converting image of type ${image::class.simpleName} " +
-                "to apply transformations: $transformations is not currently supported." +
-                "Set ImageRequest.Builder.allowConversionToBitmap(false) to skip applying these " +
-                "transformations."
-        )
     }
+
+    error(
+        "Converting image of type ${image::class.simpleName} " +
+            "to apply transformations: $transformations is not currently supported." +
+            "Set ImageRequest.Builder.allowConversionToBitmap(false) to skip applying these " +
+            "transformations."
+    )
 }
diff --git a/coil-gif/src/androidTest/java/coil3/gif/AnimatedAndNormalTransformationTest.kt b/coil-gif/src/androidTest/java/coil3/gif/AnimatedAndNormalTransformationTest.kt
@@ -80,7 +80,7 @@ class AnimatedAndNormalTransformationTest {
         assertIs<SuccessResult>(actual)
         // Make sure this is not an animated result.
         assertIsNot<Animatable>(actual.image.asDrawable(context.resources))
-        (actual.image as BitmapImage).bitmap.assertIsSimilarTo(expected)
+        assertIs<BitmapImage>(actual.image).bitmap.assertIsSimilarTo(expected)
     }
 
     class AnimatedCircleTransformation : AnimatedTransformation {