Style cleanup in OCIO area

Also fixed typo in function name.

diff --git a/intern/opencolorio/fallback_impl.cc b/intern/opencolorio/fallback_impl.cc
index 44c02d1442b7e6530cf8c05500c7d559fab53dde..d01d8d4c8f4c46b9ef8a312899868f2ba3774f98 100644 (file)
--- a/intern/opencolorio/fallback_impl.cc
+++ b/intern/opencolorio/fallback_impl.cc
@@ -331,7 +331,7 @@ void FallbackImpl::displayTransformRelease(OCIO_DisplayTransformRcPtr *)
 }
 
 OCIO_PackedImageDesc *FallbackImpl::createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels,
-                                                     long chanStrideBytes, long xStrideBytes, long yStrideBytes)
+                                                               long chanStrideBytes, long xStrideBytes, long yStrideBytes)
 {
        OCIO_PackedImageDescription *desc = (OCIO_PackedImageDescription*)MEM_callocN(sizeof(OCIO_PackedImageDescription), "OCIO_PackedImageDescription");
 

diff --git a/intern/opencolorio/ocio_capi.cc b/intern/opencolorio/ocio_capi.cc
index 18fa4b7cb1bf8f64eb4e9002e89d8023028d5cbb..4f839a61fadd94c9692c12df777a4d87588bcd57 100644 (file)
--- a/intern/opencolorio/ocio_capi.cc
+++ b/intern/opencolorio/ocio_capi.cc
@@ -238,12 +238,12 @@ void OCIO_displayTransformRelease(OCIO_DisplayTransformRcPtr *dt)
 }
 
 OCIO_PackedImageDesc *OCIO_createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels,
-                                            long chanStrideBytes, long xStrideBytes, long yStrideBytes)
+                                                      long chanStrideBytes, long xStrideBytes, long yStrideBytes)
 {
        return impl->createOCIO_PackedImageDesc(data, width, height, numChannels, chanStrideBytes, xStrideBytes, yStrideBytes);
 }
 
-void OCIO_OCIO_PackedImageDescRelease(OCIO_PackedImageDesc* id)
+void OCIO_PackedImageDescRelease(OCIO_PackedImageDesc* id)
 {
        impl->OCIO_PackedImageDescRelease(id);
 }

diff --git a/intern/opencolorio/ocio_capi.h b/intern/opencolorio/ocio_capi.h
index 0ce5f8a145685bb224e731a290a6785d0aa9940d..19fd8fe643becc83090e0517973d072d3501f80c 100644 (file)
--- a/intern/opencolorio/ocio_capi.h
+++ b/intern/opencolorio/ocio_capi.h
@@ -105,9 +105,9 @@ void OCIO_displayTransformSetLinearCC(OCIO_DisplayTransformRcPtr *dt, OCIO_Const
 void OCIO_displayTransformRelease(OCIO_DisplayTransformRcPtr *dt);
 
 OCIO_PackedImageDesc *OCIO_createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels,
-                                            long chanStrideBytes, long xStrideBytes, long yStrideBytes);
+                                                      long chanStrideBytes, long xStrideBytes, long yStrideBytes);
 
-void OCIO_OCIO_PackedImageDescRelease(OCIO_PackedImageDesc *p);
+void OCIO_PackedImageDescRelease(OCIO_PackedImageDesc *p);
 
 OCIO_ExponentTransformRcPtr *OCIO_createExponentTransform(void);
 void OCIO_exponentTransformSetValue(OCIO_ExponentTransformRcPtr *et, const float *exponent);

diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc
index 2d73d2ff56b15c4e2fa877432e8dc9a07e0a67d1..b073a038f0d4abb08f9d386946009bf094eb5a1e 100644 (file)
--- a/intern/opencolorio/ocio_impl.cc
+++ b/intern/opencolorio/ocio_impl.cc
@@ -479,7 +479,7 @@ void OCIOImpl::displayTransformRelease(OCIO_DisplayTransformRcPtr *dt)
 }
 
 OCIO_PackedImageDesc *OCIOImpl::createOCIO_PackedImageDesc(float *data, long width, long height, long numChannels,
-                                                 long chanStrideBytes, long xStrideBytes, long yStrideBytes)
+                                                           long chanStrideBytes, long xStrideBytes, long yStrideBytes)
 {
        try {
                void *mem = MEM_mallocN(sizeof(PackedImageDesc), __func__);

diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index d823e7c4882a96a76b29f4267c57d3182da3b807..2c6e46cb664864ff3c73e0294cb10d37729200d5 100644 (file)
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -351,9 +351,9 @@ static unsigned char *colormanage_cache_get(ImBuf *ibuf, const ColormanageCacheV
 
                if (cache_data->exposure != view_settings->exposure ||
                    cache_data->gamma != view_settings->gamma ||
-                       cache_data->flag != view_settings->flag ||
-                       cache_data->curve_mapping != curve_mapping ||
-                       cache_data->curve_mapping_timestamp != curve_mapping_timestamp)
+                   cache_data->flag != view_settings->flag ||
+                   cache_data->curve_mapping != curve_mapping ||
+                   cache_data->curve_mapping_timestamp != curve_mapping_timestamp)
                {
                        *cache_handle = NULL;
 
@@ -681,7 +681,7 @@ static ColorSpace *display_transform_get_colorspace(const ColorManagedViewSettin
 }
 
 static OCIO_ConstProcessorRcPtr *create_display_buffer_processor(const char *view_transform, const char *display,
-                                                            float exposure, float gamma)
+                                                                 float exposure, float gamma)
 {
        OCIO_ConstConfigRcPtr *config = OCIO_getCurrentConfig();
        OCIO_DisplayTransformRcPtr *dt;
@@ -731,7 +731,7 @@ static OCIO_ConstProcessorRcPtr *create_display_buffer_processor(const char *vie
 }
 
 static OCIO_ConstProcessorRcPtr *create_colorspace_transform_processor(const char *from_colorspace,
-                                                                  const char *to_colorspace)
+                                                                       const char *to_colorspace)
 {
        OCIO_ConstConfigRcPtr *config = OCIO_getCurrentConfig();
        OCIO_ConstProcessorRcPtr *processor;
@@ -1591,14 +1591,14 @@ void IMB_colormanagement_colorspace_to_scene_linear(float *buffer, int width, in
                OCIO_PackedImageDesc *img;
 
                img = OCIO_createOCIO_PackedImageDesc(buffer, width, height, channels, sizeof(float),
-                                                channels * sizeof(float), channels * sizeof(float) * width);
+                                                     channels * sizeof(float), channels * sizeof(float) * width);
 
                if (predivide)
                        OCIO_processorApply_predivide(processor, img);
                else
                        OCIO_processorApply(processor, img);
 
-               OCIO_OCIO_PackedImageDescRelease(img);
+               OCIO_PackedImageDescRelease(img);
        }
 }
 
@@ -2538,14 +2538,14 @@ void IMB_colormanagement_processor_apply(ColormanageProcessor *cm_processor, flo
 
                /* apply OCIO processor */
                img = OCIO_createOCIO_PackedImageDesc(buffer, width, height, channels, sizeof(float),
-                                                channels * sizeof(float), channels * sizeof(float) * width);
+                                                     channels * sizeof(float), channels * sizeof(float) * width);
 
                if (predivide)
                        OCIO_processorApply_predivide(cm_processor->processor, img);
                else
                        OCIO_processorApply(cm_processor->processor, img);
 
-               OCIO_OCIO_PackedImageDescRelease(img);
+               OCIO_PackedImageDescRelease(img);
        }
 }