griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for building without opencolorio

Browse Source
This commit is contained in:
Campbell Barton
2012-06-19 12:18:26 +00:00
parent c9e974ba21
commit 6b7e16fe8f
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/imbuf/intern/divers.c
View File

@@ -662,7 +662,12 @@ void IMB_rect_from_float_with_view_transform(ImBuf *ibuf, int view_transform)
imb_freerectviewImBuf_all(ibuf);
}
if (view_transform == IMB_VIEW_TRANSFORM_NONE) {
#ifdef WITH_OCIO
if (view_transform == IMB_VIEW_TRANSFORM_NONE)
#else
(void)view_transform;
#endif /* WITH_OCIO */
{
int profile_from;
/* create byte rect if it didn't exist yet */
@@ -686,6 +691,7 @@ void IMB_rect_from_float_with_view_transform(ImBuf *ibuf, int view_transform)
ibuf->channels, ibuf->dither, IB_PROFILE_SRGB, profile_from, predivide,
ibuf->x, ibuf->y, ibuf->x, ibuf->x);
}
#ifdef WITH_OCIO
else if (view_transform == IMB_VIEW_TRANSFORM_ACES_ODT_TONECURVE) {
unsigned int *rect_view;
@@ -712,7 +718,7 @@ void IMB_rect_from_float_with_view_transform(ImBuf *ibuf, int view_transform)
if (view_transform == IMB_VIEW_TRANSFORM_OCIO_RAW)
OCIO_displayTransformSetView(dt, "Raw");
else if (view_transform == IMB_VIEW_TRANSFORM_OCIO_RRT)
OCIO_displayTransformSetView(dt, "RRT");
OCIO_displayTransformSetView(dt, "RRT");IMB_rect_from_float_with_view_transform
else if (view_transform == IMB_VIEW_TRANSFORM_OCIO_LOG)
OCIO_displayTransformSetView(dt, "Log");
@@ -735,7 +741,7 @@ void IMB_rect_from_float_with_view_transform(ImBuf *ibuf, int view_transform)
/* do conversion */
IMB_buffer_byte_from_float((uchar *)rect_view, rect_float,
ibuf->channels, ibuf->dither, IB_PROFILE_SRGB, IB_PROFILE_SRGB, predivide,
ibuf->x, ibuf->y, ibuf->x, ibuf->x);
ibuf->x, ibuf->y, ibuf->x, ibuf->x);
}
@@ -746,6 +752,7 @@ void IMB_rect_from_float_with_view_transform(ImBuf *ibuf, int view_transform)
MEM_freeN(rect_float);
}
#endif /* WITH_OCIO */
ibuf->userflags &= ~IB_RECT_INVALID;
}