From 382375d403a2254940513e9bbd35022253b17662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= <mikrutrafal@protonmail.com>
Date: Sat, 16 Dec 2023 22:55:19 +0100
Subject: [PATCH] PD

---
 czkawka_core/src/similar_images.rs | 54 +++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/czkawka_core/src/similar_images.rs b/czkawka_core/src/similar_images.rs
index 47d117a..750172c 100644
--- a/czkawka_core/src/similar_images.rs
+++ b/czkawka_core/src/similar_images.rs
@@ -341,19 +341,33 @@ impl SimilarImages {
     fn collect_image_file_entry(&self, file_entry: &mut ImagesEntry) {
         let img;
 
-        match file_entry.image_type {
-            ImageType::Normal | ImageType::Heic => {
-                if cfg!(feature = "heif") && file_entry.image_type == ImageType::Heic {
-                    #[cfg(feature = "heif")]
-                    {
-                        img = match get_dynamic_image_from_heic(&file_entry.path.to_string_lossy()) {
-                            Ok(t) => t,
-                            Err(_) => {
-                                return;
-                            }
-                        };
+        if file_entry.image_type == ImageType::Heic {
+            #[cfg(feature = "heif")]
+            {
+                img = match get_dynamic_image_from_heic(&file_entry.path.to_string_lossy()) {
+                    Ok(t) => t,
+                    Err(_) => {
+                        return;
+                    }
+                };
+            }
+            #[cfg(not(feature = "heif"))]
+            {
+                if let Ok(image_result) = panic::catch_unwind(|| image::open(&file_entry.path)) {
+                    if let Ok(image2) = image_result {
+                        img = image2;
+                    } else {
+                        return;
                     }
                 } else {
+                    let message = crate::common::create_crash_message("Image-rs", &file_entry.path.to_string_lossy(), "https://github.com/image-rs/image/issues");
+                    println!("{message}");
+                    return;
+                }
+            }
+        } else {
+            match file_entry.image_type {
+                ImageType::Normal | ImageType::Heic => {
                     if let Ok(image_result) = panic::catch_unwind(|| image::open(&file_entry.path)) {
                         if let Ok(image2) = image_result {
                             img = image2;
@@ -366,15 +380,15 @@ impl SimilarImages {
                         return;
                     }
                 }
-            }
-            ImageType::Raw => {
-                img = match get_dynamic_image_from_raw_image(&file_entry.path) {
-                    Some(t) => t,
-                    None => return,
-                };
-            }
-            _ => {
-                unreachable!();
+                ImageType::Raw => {
+                    img = match get_dynamic_image_from_raw_image(&file_entry.path) {
+                        Some(t) => t,
+                        None => return,
+                    };
+                }
+                _ => {
+                    unreachable!();
+                }
             }
         }