diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 16:21:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-07 16:21:54 +0300 |
| commit | 1c0905be0f6c36524adeb43237d9541bb1e6dc1e (patch) | |
| tree | 7fc7a5f1d9adf13c5a589f938b568b1440264f23 /source/blender/imbuf | |
| parent | 1c7cfa025c87e8f31790b48cbb189949f7949ad1 (diff) | |
| parent | efdd8f12a097be6d9b75948ead26fa5dc0181755 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineon_dpx.c | 4 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/logImageCore.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c index 3e2206dc013..1d2ebf88a32 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.c +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c @@ -59,7 +59,7 @@ static struct ImBuf *imb_load_dpx_cineon( colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_FLOAT); - logImageSetVerbose((G.f & G_DEBUG) ? 1 : 0); + logImageSetVerbose((G.debug & G_DEBUG) ? 1 : 0); image = logImageOpenFromMemory(mem, size); @@ -107,7 +107,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon return 0; } - logImageSetVerbose((G.f & G_DEBUG) ? 1 : 0); + logImageSetVerbose((G.debug & G_DEBUG) ? 1 : 0); depth = (ibuf->planes + 7) >> 3; if (depth > 4 || depth < 3) { diff --git a/source/blender/imbuf/intern/cineon/logImageCore.c b/source/blender/imbuf/intern/cineon/logImageCore.c index 600642f5e44..7b5dec4da41 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.c +++ b/source/blender/imbuf/intern/cineon/logImageCore.c @@ -1020,6 +1020,7 @@ static int convertRGBA_RGB(float *src, float *dst, LogImageFile *logImage, float *dst_ptr = dst; switch (logElement.transfer) { + case transfer_Unspecified: case transfer_UserDefined: case transfer_Linear: case transfer_Logarithmic: { @@ -1054,6 +1055,7 @@ static int convertRGBA_RGB(float *src, float *dst, LogImageFile *logImage, } default: + if (verbose) printf("DPX/Cineon: Unknown transfer %d.\n", logElement.transfer); return 1; } } @@ -1066,6 +1068,7 @@ static int convertRGB_RGBA(float *src, float *dst, LogImageFile *logImage, float *dst_ptr = dst; switch (logElement.transfer) { + case transfer_Unspecified: case transfer_UserDefined: case transfer_Linear: case transfer_Logarithmic: { @@ -1100,6 +1103,7 @@ static int convertRGB_RGBA(float *src, float *dst, LogImageFile *logImage, } default: + if (verbose) printf("DPX/Cineon: Unknown transfer %d.\n", logElement.transfer); return 1; } } |