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:
authorCampbell Barton <ideasman42@gmail.com>2012-01-20 19:18:57 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-01-20 19:18:57 +0400
commit172685322638f92906ef3baf39d92399903bdfb3 (patch)
treeff6ebdc4d1fa942adfd0d01b589d36b91120042f /source/blender/imbuf
parent605aa16dd76c8c2e6eb62dc1686af81e40568c81 (diff)
comment some dead assibnment and set dummy values for image profile conversion in case of invalid input.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/divers.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index 7e086716d3e..a8ca282de66 100644
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -645,15 +645,19 @@ void IMB_convert_profile(ImBuf *ibuf, int profile)
profile_from = IB_PROFILE_LINEAR_RGB;
else if(ELEM(ibuf->profile, IB_PROFILE_SRGB, IB_PROFILE_NONE))
profile_from = IB_PROFILE_SRGB;
- else
+ else {
BLI_assert(0);
+ profile_from = IB_PROFILE_SRGB; /* dummy, should never happen */
+ }
if(profile == IB_PROFILE_LINEAR_RGB)
profile_to = IB_PROFILE_LINEAR_RGB;
else if(ELEM(profile, IB_PROFILE_SRGB, IB_PROFILE_NONE))
profile_to = IB_PROFILE_SRGB;
- else
+ else {
BLI_assert(0);
+ profile_to = IB_PROFILE_SRGB; /* dummy, should never happen */
+ }
/* do conversion */
if(ibuf->rect_float) {