Skip to content

fix(raw): include LibRaw error messages within ours #5573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgritz merged 2 commits into from
Oct 17, 2026
Merged

fix(raw): include LibRaw error messages within ours #5573

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f89517
fix(raw): include LibRaw error messages within ours
lgritz Oct 16, 2026
4770cdf
Make a common libraw_errmsg to handle err codes being a mix of C styl…
lgritz Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 41 additions & 17 deletions src/raw.imageio/rawinput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,33 @@ libraw_xtrans_filter_to_str(char (&filters)[6][6])
}
return result;
}


// Sometimes LibRaw returns error codes that are its own -- they are all
// negative values and use libraw_strerror to turn into strings. But they also
// mix in positive error codes like EINVAL, for which we use C stderror.
std::string
libraw_errmsg(int ret)
{
std::string msg;
if (ret < 0) {
// libraw specific error -- use its lookup
if (const char* m = libraw_strerror(ret))
msg = m;
} else if (ret > 0) {
// C style error code, use safe version of strerror
const size_t maxbuf = 100;
char buf[maxbuf] = { 0 };
if (strerror_r(ret, buf, maxbuf) == 0)
msg = std::string(buf);
} else if (ret == 0) {
msg = "ok"; // 0 means "no error"
}
if (msg.empty())
msg = "unknown error";
return msg;
}

} // namespace

bool
Expand Down Expand Up @@ -450,9 +477,8 @@ RawInput::open_raw(bool unpack, bool process, const std::string& name,
int ret = m_processor->open_file(name.c_str());
#endif
if (ret != LIBRAW_SUCCESS) {
const char* err = libraw_strerror(ret);
errorfmt("Could not open file \"{}\", {}", m_filename,
err ? err : "unknown error");
libraw_errmsg(ret));
return false;
}

Expand Down Expand Up @@ -487,9 +513,8 @@ RawInput::open_raw(bool unpack, bool process, const std::string& name,
OIIO_ASSERT(!m_unpacked);
if (unpack) {
if ((ret = m_processor->unpack()) != LIBRAW_SUCCESS) {
const char* err = libraw_strerror(ret);
errorfmt("Could not unpack \"{}\", {}", m_filename,
err ? err : "unknown error");
libraw_errmsg(ret));
return false;
}
m_unpacked = true;
Expand Down Expand Up @@ -993,16 +1018,14 @@ RawInput::open_raw(bool unpack, bool process, const std::string& name,
// Get unadjusted max value (need to force a read first)
ret = m_processor->raw2image_ex(/*subtract_black=*/true);
if (ret != LIBRAW_SUCCESS) {
const char* err = libraw_strerror(ret);
errorfmt("HighlightMode adjustment detection read failed ({})",
err ? err : "unknown error");
libraw_errmsg(ret));
return false;
}
ret = m_processor->adjust_maximum();
if (ret != LIBRAW_SUCCESS) {
const char* err = libraw_strerror(ret);
errorfmt("HighlightMode minimum adjustment failed ({})",
err ? err : "unknown error");
libraw_errmsg(ret));
return false;
}
float unadjusted = m_processor->imgdata.color.maximum;
Expand All @@ -1014,9 +1037,8 @@ RawInput::open_raw(bool unpack, bool process, const std::string& name,
// Get new max value
ret = m_processor->adjust_maximum();
if (ret != LIBRAW_SUCCESS) {
const char* err = libraw_strerror(ret);
errorfmt("HighlightMode maximum adjustment failed ({})",
err ? err : "unknown error");
libraw_errmsg(ret));
return false;
}
float adjusted = m_processor->imgdata.color.maximum;
Expand Down Expand Up @@ -1690,15 +1712,14 @@ RawInput::do_process()
if (!m_image) {
int ret = m_processor->dcraw_process();
if (ret != LIBRAW_SUCCESS) {
const char* err = libraw_strerror(ret);
errorfmt("Processing image failed, {}",
err ? err : "unknown error");
errorfmt("Processing image failed, {}", libraw_errmsg(ret));
return false;
}

m_image = m_processor->dcraw_make_mem_image(&ret);
if (!m_image) {
errorfmt("LibRaw failed to create in memory image");
errorfmt("LibRaw failed to create in memory image ({})",
libraw_errmsg(ret));
return false;
}

Expand Down Expand Up @@ -1879,15 +1900,17 @@ RawInput::get_thumbnail(ImageBuf& thumb, int subimage)

if (errcode != 0) {
if (errcode != LIBRAW_REQUEST_FOR_NONEXISTENT_THUMBNAIL)
thumb_errorfmt(this, m_thumb_index, "unpack_thumb_ex error");
thumb_errorfmt(this, m_thumb_index, "unpack_thumb_ex error ({})",
Comment thread
lgritz marked this conversation as resolved.
libraw_errmsg(errcode));
return false;
}

std::unique_ptr<libraw_processed_image_t, void (*)(libraw_processed_image_t*)>
m_thumb(m_processor->dcraw_make_mem_thumb(&errcode),
LibRaw::dcraw_clear_mem);
if (m_thumb == nullptr) {
thumb_errorfmt(this, subimage, "dcraw_make_mem_thumb error");
thumb_errorfmt(this, subimage, "dcraw_make_mem_thumb error ({})",
libraw_errmsg(errcode));
return false;
}

Expand Down Expand Up @@ -1930,7 +1953,8 @@ RawInput::get_thumbnail(ImageBuf& thumb, int subimage)
auto image_input = OIIO::ImageInput::create(image_type, false);
if (image_input == nullptr) {
thumb_errorfmt(this, m_thumb_index,
"OIIO::ImageInput::create(\{}\") error", image_type);
"OIIO::ImageInput::create(\"{}\") error",
image_type);
return false;
}

Expand Down
Loading