42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 7903346bfd5f8c24e5bfd4df48f0e5cd1e7b65cb Mon Sep 17 00:00:00 2001
|
|
From: Alex Tutubalin <lexa@lexa.ru>
|
|
Date: Fri, 21 Dec 2018 09:37:05 +0300
|
|
Subject: [PATCH] check for raw_image presence in raw2image_ex
|
|
|
|
---
|
|
src/libraw_cxx.cpp | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/libraw_cxx.cpp b/src/libraw_cxx.cpp
|
|
index 074d81a4..43aed1cc 100644
|
|
--- a/src/libraw_cxx.cpp
|
|
+++ b/src/libraw_cxx.cpp
|
|
@@ -3374,7 +3374,8 @@ int LibRaw::raw2image(void)
|
|
get_decoder_info(&decoder_info);
|
|
|
|
// Move saved bitmap to imgdata.image
|
|
- if ((imgdata.idata.filters || P1.colors == 1) && imgdata.rawdata.raw_image)
|
|
+ if ((imgdata.idata.filters || P1.colors == 1)
|
|
+ && imgdata.rawdata.raw_image)
|
|
{
|
|
if (IO.fuji_width)
|
|
{
|
|
@@ -3638,7 +3639,7 @@ int LibRaw::raw2image_ex(int do_subtract_black)
|
|
raw2image_start();
|
|
|
|
// Compressed P1 files with bl data!
|
|
- if (is_phaseone_compressed())
|
|
+ if (is_phaseone_compressed() && imgdata.rawdata.raw_image)
|
|
{
|
|
phase_one_allocate_tempbuffer();
|
|
int rc = phase_one_subtract_black((ushort *)imgdata.rawdata.raw_alloc, imgdata.rawdata.raw_image);
|
|
@@ -3745,7 +3746,7 @@ int LibRaw::raw2image_ex(int do_subtract_black)
|
|
}
|
|
|
|
// Move saved bitmap to imgdata.image
|
|
- if (imgdata.idata.filters || P1.colors == 1)
|
|
+ if ((imgdata.idata.filters || P1.colors == 1) && imgdata.rawdata.raw_image)
|
|
{
|
|
if (IO.fuji_width)
|
|
{
|