From 559e1e12933ff8f9f9a4b5ed8bcd2f4046094b74 Mon Sep 17 00:00:00 2001
From: Daniel Vogelbacher <daniel@chaospixel.com>
Date: Sat, 13 Nov 2021 14:22:54 +0100
Subject: [PATCH] Minor fixes and requested code changes

---
 src/common/image.c             |  2 +-
 src/common/imageio_libraw.c    | 12 ++++++------
 src/common/imageio_rawspeed.cc |  4 ++--
 src/common/imageio_rawspeed.h  |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/common/image.c b/src/common/image.c
index 0faca852132b..486bfdbf3be7 100644
--- a/src/common/image.c
+++ b/src/common/image.c
@@ -1793,7 +1793,7 @@ void dt_image_refresh_makermodel(dt_image_t *img)
   if(!img->camera_maker[0] || !img->camera_model[0] || !img->camera_alias[0])
   {
     // We need to use the exif values, so let's get rawspeed to munge them
-    int found = dt_rawspeed_lookup_makermodel(img->exif_maker, img->exif_model,
+    gboolean found = dt_rawspeed_lookup_makermodel(img->exif_maker, img->exif_model,
                                               img->camera_maker, sizeof(img->camera_maker),
                                               img->camera_model, sizeof(img->camera_model),
                                               img->camera_alias, sizeof(img->camera_alias));
diff --git a/src/common/imageio_libraw.c b/src/common/imageio_libraw.c
index 79d7b602d836..044a8d656f28 100644
--- a/src/common/imageio_libraw.c
+++ b/src/common/imageio_libraw.c
@@ -54,11 +54,11 @@ static gboolean _supported_image(const gchar *filename)
 
 
 
-int dt_libraw_lookup_makermodel(const char *maker, const char *model,
-                                   char *mk, int mk_len, char *md, int md_len,
-                                   char *al, int al_len)
+gboolean dt_libraw_lookup_makermodel(const char *maker, const char *model,
+                                     char *mk, int mk_len, char *md, int md_len,
+                                     char *al, int al_len)
 {
-  int got_it_done = FALSE;
+  gboolean got_it_done = FALSE;
 
   if(g_str_equal(maker, "Canon"))
   {
@@ -101,7 +101,7 @@ dt_imageio_retval_t dt_imageio_open_libraw(dt_image_t *img, const char *filename
   // But seems to be the best available. libraw crx decoder can actually
   // decode the raw data, but internal metadata like wb_coeffs, crops etc.
   // are not populated into libraw structure.
-  if(raw->color.cam_mul[0] == 0.0)
+  if(raw->color.cam_mul[0] == 0.0 || isnan(raw->color.cam_mul[0]))
   {
     libraw_close(raw);
     return DT_IMAGEIO_FILE_CORRUPTED;
@@ -187,7 +187,7 @@ dt_imageio_retval_t dt_imageio_open_libraw(dt_image_t *img, const char *filename
   return DT_IMAGEIO_OK;
 
 error:
-  printf("libraw error: %s\n", libraw_strerror(libraw_err));
+  fprintf(stderr, "libraw error: %s\n", libraw_strerror(libraw_err));
   libraw_close(raw);
   return err;
 }
diff --git a/src/common/imageio_rawspeed.cc b/src/common/imageio_rawspeed.cc
index ab7835490689..c52dec5c1834 100644
--- a/src/common/imageio_rawspeed.cc
+++ b/src/common/imageio_rawspeed.cc
@@ -73,11 +73,11 @@ static void dt_rawspeed_load_meta() {
   }
 }
 
-int dt_rawspeed_lookup_makermodel(const char *maker, const char *model,
+gboolean dt_rawspeed_lookup_makermodel(const char *maker, const char *model,
                                    char *mk, int mk_len, char *md, int md_len,
                                    char *al, int al_len)
 {
-  int got_it_done = FALSE;
+  gboolean got_it_done = FALSE;
   try {
     dt_rawspeed_load_meta();
     const Camera *cam = meta->getCamera(maker, model, "");
diff --git a/src/common/imageio_rawspeed.h b/src/common/imageio_rawspeed.h
index 1d1e18c64407..0008c09867b5 100644
--- a/src/common/imageio_rawspeed.h
+++ b/src/common/imageio_rawspeed.h
@@ -25,9 +25,9 @@ extern "C" {
 #include "common/image.h"
 #include "common/mipmap_cache.h"
 
-int dt_rawspeed_lookup_makermodel(const char *maker, const char *model,
-                                   char *mk, int mk_len, char *md, int md_len,
-                                   char *al, int al_len);
+gboolean dt_rawspeed_lookup_makermodel(const char *maker, const char *model,
+                                       char *mk, int mk_len, char *md, int md_len,
+                                       char *al, int al_len);
 
 uint32_t dt_rawspeed_crop_dcraw_filters(uint32_t filters, uint32_t crop_x, uint32_t crop_y);