Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-07-27 18:53:57 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-07-27 18:53:57 +0400
commit49e0c832e16195d8a656798830a63074eb6cd6c7 (patch)
treec9bf9e53287be88bc2efc7beeebdd92a4745d6db /source/blender/imbuf/intern/divers.c
parent409a6ee57b66b610f8d05a777f54ffc20b701a0f (diff)
Move sRGB conversion initialization to init_exit routines
It was a threading issue in color management project which potentially could happen in trunk as well.
Diffstat (limited to 'source/blender/imbuf/intern/divers.c')
-rw-r--r--source/blender/imbuf/intern/divers.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index 1b68c520336..d46bf4fca4d 100644
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -199,7 +199,6 @@ void IMB_buffer_byte_from_float(uchar *rect_to, const float *rect_from,
BLI_assert(profile_to != IB_PROFILE_NONE);
BLI_assert(profile_from != IB_PROFILE_NONE);
- BLI_init_srgb_conversion();
if (dither)
di = create_dither_context(width, dither);
@@ -335,8 +334,6 @@ void IMB_buffer_float_from_byte(float *rect_to, const uchar *rect_from,
BLI_assert(profile_to != IB_PROFILE_NONE);
BLI_assert(profile_from != IB_PROFILE_NONE);
- BLI_init_srgb_conversion();
-
/* RGBA input */
for (y = 0; y < height; y++) {
const uchar *from = rect_from + stride_from * y * 4;