Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unused IMB function which wasn't ported to new color management

Browse Source 
Also marked some TODOs as actually solved.
This commit is contained in:
Sergey Sharybin
2013-01-08 13:32:48 +00:00
parent 1524b1f11d
commit c69f571478
3 changed files with 0 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/imbuf/IMB_imbuf.h
View File

@@ -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 */ * 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_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); 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_color_to_bw(struct ImBuf *ibuf);
void IMB_saturation(struct ImBuf *ibuf, float sat); void IMB_saturation(struct ImBuf *ibuf, float sat);

47
source/blender/imbuf/intern/divers.c
View File

@@ -659,53 +659,6 @@ void IMB_float_from_rect(ImBuf *ibuf)
BLI_unlock_thread(LOCK_COLORMANAGE); 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 *****************************/ /**************************** Color to Grayscale *****************************/
/* no profile conversion */ /* no profile conversion */

1
source/blender/makesrna/intern/rna_sequencer_api.c
View File

@@ -200,7 +200,6 @@ static Sequence *rna_Sequences_new_movie(ID *id, Editing *ed, ReportList *report
Scene *scene = (Scene *)id; Scene *scene = (Scene *)id;
Sequence *seq; Sequence *seq;
/* OCIO_TODO: support configurable color spaces for strips */
struct anim *an = openanim(file, IB_rect, 0, NULL); struct anim *an = openanim(file, IB_rect, 0, NULL);
if (an == NULL) { if (an == NULL) {