← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/divers.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/imbuf/intern/divers.c
565
565
        buffer = MEM_dupallocN(ibuf->rect_float);
566
566
 
567
567
        /* first make float buffer in byte space */
568
 
        IMB_colormanagement_transform(buffer, ibuf->x, ibuf->y, ibuf->channels, from_colorspace, ibuf->rect_colorspace->name, TRUE);
 
568
        IMB_colormanagement_transform(buffer, ibuf->x, ibuf->y, ibuf->channels, from_colorspace, ibuf->rect_colorspace->name, true);
569
569
 
570
570
        /* convert from float's premul alpha to byte's straight alpha */
571
571
        IMB_unpremultiply_rect_float(buffer, ibuf->planes, ibuf->x, ibuf->y);
657
657
 
658
658
        /* then make float be in linear space */
659
659
        IMB_colormanagement_colorspace_to_scene_linear(rect_float, ibuf->x, ibuf->y, ibuf->channels,
660
 
                                                       ibuf->rect_colorspace, FALSE);
 
660
                                                       ibuf->rect_colorspace, false);
661
661
 
662
662
        /* byte buffer is straight alpha, float should always be premul */
663
663
        IMB_premultiply_rect_float(rect_float, ibuf->channels, ibuf->x, ibuf->y);