diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-08 17:32:48 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-01-08 17:32:48 +0400 |
commit | c69f57147882e75900aac77a89f2181bccc6e665 (patch) | |
tree | ae1f200d82464f4180e6c6ecb7a1d7ed17e4b3b7 /source/blender | |
parent | 1524b1f11db98faf92441360a9a22a9d6a20babe (diff) |
Remove unused IMB function which wasn't ported to new color management
Also marked some TODOs as actually solved.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/imbuf/IMB_imbuf.h | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/divers.c | 47 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer_api.c | 1 |
3 files changed, 0 insertions, 50 deletions
diff --git a/source/blender/imbuf/IMB_imbuf.h b/source/blender/imbuf/IMB_imbuf.h index 8d60227377b..a19433dbd2f 100644 --- a/source/blender/imbuf/IMB_imbuf.h +++ b/source/blender/imbuf/IMB_imbuf.h @@ -373,8 +373,6 @@ void IMB_rect_from_float(struct ImBuf *ibuf); * Changed part will be stored in buffer. This is expected to be used for texture painting updates */ void IMB_partial_rect_from_float(struct ImBuf *ibuf, float *buffer, int x, int y, int w, int h, int is_data); void IMB_float_from_rect(struct ImBuf *ibuf); -/* note, check that the conversion exists, only some are supported */ -float *IMB_float_profile_ensure(struct ImBuf *ibuf, int profile, int *alloc); void IMB_color_to_bw(struct ImBuf *ibuf); void IMB_saturation(struct ImBuf *ibuf, float sat); diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c index f0d8b7cac72..84339b51721 100644 --- a/source/blender/imbuf/intern/divers.c +++ b/source/blender/imbuf/intern/divers.c @@ -659,53 +659,6 @@ void IMB_float_from_rect(ImBuf *ibuf) BLI_unlock_thread(LOCK_COLORMANAGE); } -/* use when you need to get a buffer with a certain profile - * if the return */ - -/* OCIO_TODO: used only by Cineon/DPX exporter which is still broken, so can not guarantee - * this function is working properly - */ -float *IMB_float_profile_ensure(ImBuf *ibuf, int profile, int *alloc) -{ - int profile_from = IB_PROFILE_LINEAR_RGB; - int profile_to; - - /* determine profile */ - if (profile == IB_PROFILE_NONE) - profile_to = IB_PROFILE_LINEAR_RGB; - else - profile_to = IB_PROFILE_SRGB; - - if (profile_from == profile_to) { - /* simple case, just allocate the buffer and return */ - *alloc = 0; - - if (ibuf->rect_float == NULL) - IMB_float_from_rect(ibuf); - - return ibuf->rect_float; - } - else { - /* conversion is needed, first check */ - float *fbuf = MEM_mallocN(ibuf->x * ibuf->y * sizeof(float) * 4, "IMB_float_profile_ensure"); - *alloc = 1; - - if (ibuf->rect_float == NULL) { - IMB_buffer_float_from_byte(fbuf, (uchar *)ibuf->rect, - profile_to, profile_from, FALSE, - ibuf->x, ibuf->y, ibuf->x, ibuf->x); - IMB_premultiply_rect_float(ibuf->rect_float, ibuf->planes, ibuf->x, ibuf->y); - } - else { - IMB_buffer_float_from_float(fbuf, ibuf->rect_float, - 4, profile_to, profile_from, TRUE, - ibuf->x, ibuf->y, ibuf->x, ibuf->x); - } - - return fbuf; - } -} - /**************************** Color to Grayscale *****************************/ /* no profile conversion */ diff --git a/source/blender/makesrna/intern/rna_sequencer_api.c b/source/blender/makesrna/intern/rna_sequencer_api.c index 9df8662263c..386263c784e 100644 --- a/source/blender/makesrna/intern/rna_sequencer_api.c +++ b/source/blender/makesrna/intern/rna_sequencer_api.c @@ -200,7 +200,6 @@ static Sequence *rna_Sequences_new_movie(ID *id, Editing *ed, ReportList *report Scene *scene = (Scene *)id; Sequence *seq; - /* OCIO_TODO: support configurable color spaces for strips */ struct anim *an = openanim(file, IB_rect, 0, NULL); if (an == NULL) { |