[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48076] branches/soc-2011-tomato/source/ blender/imbuf/intern/divers.c: fix for building without opencolorio

[Campbell Barton]

Revision: 48076
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48076
Author:   campbellbarton
Date:     2012-06-19 12:18:26 +0000 (Tue, 19 Jun 2012)
Log Message:
-----------
fix for building without opencolorio

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c       
2012-06-19 11:04:23 UTC (rev 48075)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/divers.c       
2012-06-19 12:18:26 UTC (rev 48076)
@@ -662,7 +662,12 @@
                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 @@
                                           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 @@
                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 @@
                        /* 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 @@
 
                MEM_freeN(rect_float);
        }
+#endif /* WITH_OCIO */
 
        ibuf->userflags &= ~IB_RECT_INVALID;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs