style cleanup
[blender.git] / source / blender / blenkernel / intern / image.c
index beaf8f719e3587afe1fbdc16c7e4f0f4c84e7c82..22995e5a7eed4d7b38fc71f38601e6a97cf8488d 100644 (file)
@@ -47,6 +47,7 @@
 
 #include "MEM_guardedalloc.h"
 
+#include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 
@@ -67,9 +68,9 @@
 #include "BLI_blenlib.h"
 #include "BLI_threads.h"
 #include "BLI_utildefines.h"
-#include "BLI_bpath.h"
 
 #include "BKE_bmfont.h"
+#include "BKE_colortools.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_image.h"
@@ -79,7 +80,6 @@
 #include "BKE_scene.h"
 #include "BKE_node.h"
 #include "BKE_sequencer.h" /* seq_foreground_frame_get() */
-#include "BKE_utildefines.h"
 
 #include "BLF_api.h"
 
@@ -99,6 +99,8 @@
 
 #include "WM_api.h"
 
+static SpinLock image_spin;
+
 /* max int, to indicate we don't store sequences in ibuf */
 #define IMA_NO_INDEX    0x7FEFEFEF
 
 #define IMA_INDEX_FRAME(index)          (index >> 10)
 #define IMA_INDEX_PASS(index)           (index & ~1023)
 
+void BKE_images_init(void)
+{
+       BLI_spin_init(&image_spin);
+}
+
+void BKE_images_exit(void)
+{
+       BLI_spin_end(&image_spin);
+}
+
 /* ******** IMAGE PROCESSING ************* */
 
 static void de_interlace_ng(struct ImBuf *ibuf) /* neogeo fields */
@@ -167,13 +179,14 @@ static void de_interlace_st(struct ImBuf *ibuf) /* standard fields */
 
 void BKE_image_de_interlace(Image *ima, int odd)
 {
-       ImBuf *ibuf = BKE_image_get_ibuf(ima, NULL);
+       ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL);
        if (ibuf) {
                if (odd)
                        de_interlace_st(ibuf);
                else
                        de_interlace_ng(ibuf);
        }
+       BKE_image_release_ibuf(ima, ibuf, NULL);
 }
 
 /* ***************** ALLOC & FREE, DATA MANAGING *************** */
@@ -244,6 +257,11 @@ static Image *image_alloc(const char *name, short source, short type)
 
                ima->source = source;
                ima->type = type;
+
+               if (source == IMA_SRC_VIEWER)
+                       ima->flag |= IMA_VIEW_AS_RENDER;
+
+               BKE_color_managed_colorspace_settings_init(&ima->colorspace_settings);
        }
        return ima;
 }
@@ -254,8 +272,9 @@ static ImBuf *image_get_ibuf(Image *ima, int index, int frame)
        /* this function is intended to be thread safe. with IMA_NO_INDEX this
         * should be OK, but when iterating over the list this is more tricky
         * */
-       if (index == IMA_NO_INDEX)
+       if (index == IMA_NO_INDEX) {
                return ima->ibufs.first;
+       }
        else {
                ImBuf *ibuf;
 
@@ -263,9 +282,9 @@ static ImBuf *image_get_ibuf(Image *ima, int index, int frame)
                for (ibuf = ima->ibufs.first; ibuf; ibuf = ibuf->next)
                        if (ibuf->index == index)
                                return ibuf;
-
-               return NULL;
        }
+
+       return NULL;
 }
 
 /* no ima->ibuf anymore, but listbase */
@@ -326,6 +345,8 @@ Image *BKE_image_copy(Image *ima)
        nima->aspx = ima->aspx;
        nima->aspy = ima->aspy;
 
+       BKE_color_managed_colorspace_settings_copy(&nima->colorspace_settings, &ima->colorspace_settings);
+
        return nima;
 }
 
@@ -526,7 +547,7 @@ int BKE_image_scale(Image *image, int width, int height)
                ibuf->userflags |= IB_BITMAPDIRTY;
        }
 
-       BKE_image_release_ibuf(image, lock);
+       BKE_image_release_ibuf(image, ibuf, lock);
 
        return (ibuf != NULL);
 }
@@ -595,7 +616,8 @@ Image *BKE_image_load_exists(const char *filepath)
        return BKE_image_load(filepath);
 }
 
-static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short uvtestgrid, float color[4])
+static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short gen_type,
+                            float color[4], ColorManagedColorspaceSettings *colorspace_settings)
 {
        ImBuf *ibuf;
        unsigned char *rect = NULL;
@@ -603,34 +625,55 @@ static ImBuf *add_ibuf_size(unsigned int width, unsigned int height, const char
 
        if (floatbuf) {
                ibuf = IMB_allocImBuf(width, height, depth, IB_rectfloat);
-               rect_float = (float *)ibuf->rect_float;
-               ibuf->profile = IB_PROFILE_LINEAR_RGB;
+               rect_float = ibuf->rect_float;
+
+               if (colorspace_settings->name[0] == '\0') {
+                       const char *colorspace = IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DEFAULT_FLOAT);
+
+                       BLI_strncpy(colorspace_settings->name, colorspace, sizeof(colorspace_settings->name));
+               }
+
+               IMB_colormanagement_check_is_data(ibuf, colorspace_settings->name);
        }
        else {
                ibuf = IMB_allocImBuf(width, height, depth, IB_rect);
                rect = (unsigned char *)ibuf->rect;
-               ibuf->profile = IB_PROFILE_SRGB;
+
+               if (colorspace_settings->name[0] == '\0') {
+                       const char *colorspace = IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DEFAULT_BYTE);
+
+                       BLI_strncpy(colorspace_settings->name, colorspace, sizeof(colorspace_settings->name));
+               }
+
+               IMB_colormanagement_assign_rect_colorspace(ibuf, colorspace_settings->name);
        }
 
        BLI_strncpy(ibuf->name, name, sizeof(ibuf->name));
        ibuf->userflags |= IB_BITMAPDIRTY;
 
-       switch (uvtestgrid) {
-               case 1:
+       switch (gen_type) {
+               case IMA_GENTYPE_GRID:
                        BKE_image_buf_fill_checker(rect, rect_float, width, height);
                        break;
-               case 2:
+               case IMA_GENTYPE_GRID_COLOR:
                        BKE_image_buf_fill_checker_color(rect, rect_float, width, height);
                        break;
                default:
                        BKE_image_buf_fill_color(rect, rect_float, width, height, color);
        }
 
+       if (rect_float) {
+               /* both byte and float buffers are filling in sRGB space, need to linearize float buffer after BKE_image_buf_fill* functions */
+
+               IMB_buffer_float_from_float(rect_float, rect_float, ibuf->channels, IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB,
+                                           ibuf->flags & IB_cm_predivide, ibuf->x, ibuf->y, ibuf->x, ibuf->x);
+       }
+
        return ibuf;
 }
 
 /* adds new image block, creates ImBuf and initializes color */
-Image *BKE_image_add_generated(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short uvtestgrid, float color[4])
+Image *BKE_image_add_generated(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short gen_type, float color[4])
 {
        /* on save, type is changed to FILE in editsima.c */
        Image *ima = image_alloc(name, IMA_SRC_GENERATED, IMA_TYPE_UV_TEST);
@@ -641,10 +684,10 @@ Image *BKE_image_add_generated(unsigned int width, unsigned int height, const ch
                /* BLI_strncpy(ima->name, name, FILE_MAX); */ /* don't do this, this writes in ain invalid filepath! */
                ima->gen_x = width;
                ima->gen_y = height;
-               ima->gen_type = uvtestgrid;
+               ima->gen_type = gen_type;
                ima->gen_flag |= (floatbuf ? IMA_GEN_FLOAT : 0);
 
-               ibuf = add_ibuf_size(width, height, ima->name, depth, floatbuf, uvtestgrid, color);
+               ibuf = add_ibuf_size(width, height, ima->name, depth, floatbuf, gen_type, color, &ima->colorspace_settings);
                image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
 
                ima->ok = IMA_OK_LOADED;
@@ -741,7 +784,7 @@ void free_old_images(void)
                return;
 
        /* of course not! */
-       if (G.rendering)
+       if (G.is_rendering)
                return;
 
        lasttime = ctime;
@@ -894,7 +937,7 @@ int BKE_imtype_to_ftype(const char imtype)
                return RADHDR;
 #endif
        else if (imtype == R_IMF_IMTYPE_PNG)
-               return PNG;
+               return PNG | 90;
 #ifdef WITH_DDS
        else if (imtype == R_IMF_IMTYPE_DDS)
                return DDS;
@@ -969,7 +1012,6 @@ int BKE_imtype_is_movie(const char imtype)
        switch (imtype) {
                case R_IMF_IMTYPE_AVIRAW:
                case R_IMF_IMTYPE_AVIJPEG:
-               case R_IMF_IMTYPE_AVICODEC:
                case R_IMF_IMTYPE_QUICKTIME:
                case R_IMF_IMTYPE_FFMPEG:
                case R_IMF_IMTYPE_H264:
@@ -1011,6 +1053,19 @@ int BKE_imtype_supports_quality(const char imtype)
        return 0;
 }
 
+int BKE_imtype_requires_linear_float(const char imtype)
+{
+       switch (imtype) {
+               case R_IMF_IMTYPE_CINEON:
+               case R_IMF_IMTYPE_DPX:
+               case R_IMF_IMTYPE_RADHDR:
+               case R_IMF_IMTYPE_OPENEXR:
+               case R_IMF_IMTYPE_MULTILAYER:
+                       return TRUE;
+       }
+       return 0;
+}
+
 char BKE_imtype_valid_channels(const char imtype)
 {
        char chan_flag = IMA_CHAN_FLAG_RGB; /* assume all support rgb */
@@ -1028,6 +1083,7 @@ char BKE_imtype_valid_channels(const char imtype)
                case R_IMF_IMTYPE_DDS:
                case R_IMF_IMTYPE_JP2:
                case R_IMF_IMTYPE_QUICKTIME:
+               case R_IMF_IMTYPE_DPX:
                        chan_flag |= IMA_CHAN_FLAG_ALPHA;
        }
 
@@ -1056,10 +1112,11 @@ char BKE_imtype_valid_depths(const char imtype)
                        return R_IMF_CHAN_DEPTH_16 | R_IMF_CHAN_DEPTH_32;
                case R_IMF_IMTYPE_MULTILAYER:
                        return R_IMF_CHAN_DEPTH_32;
-               /* eeh, cineone does some strange 10bits per channel */
+               /* eeh, cineon does some strange 10bits per channel */
                case R_IMF_IMTYPE_DPX:
+                       return R_IMF_CHAN_DEPTH_8 | R_IMF_CHAN_DEPTH_10 | R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16;
                case R_IMF_IMTYPE_CINEON:
-                       return R_IMF_CHAN_DEPTH_12;
+                       return R_IMF_CHAN_DEPTH_10;
                case R_IMF_IMTYPE_JP2:
                        return R_IMF_CHAN_DEPTH_8 | R_IMF_CHAN_DEPTH_12 | R_IMF_CHAN_DEPTH_16;
                /* most formats are 8bit only */
@@ -1084,7 +1141,6 @@ char BKE_imtype_from_arg(const char *imtype_arg)
        else if (!strcmp(imtype_arg, "AVIRAW")) return R_IMF_IMTYPE_AVIRAW;
        else if (!strcmp(imtype_arg, "AVIJPEG")) return R_IMF_IMTYPE_AVIJPEG;
        else if (!strcmp(imtype_arg, "PNG")) return R_IMF_IMTYPE_PNG;
-       else if (!strcmp(imtype_arg, "AVICODEC")) return R_IMF_IMTYPE_AVICODEC;
        else if (!strcmp(imtype_arg, "QUICKTIME")) return R_IMF_IMTYPE_QUICKTIME;
        else if (!strcmp(imtype_arg, "BMP")) return R_IMF_IMTYPE_BMP;
 #ifdef WITH_HDR
@@ -1109,9 +1165,10 @@ char BKE_imtype_from_arg(const char *imtype_arg)
        else return R_IMF_IMTYPE_INVALID;
 }
 
-int BKE_add_image_extension(char *string, const char imtype)
+static int do_add_image_extension(char *string, const char imtype, const ImageFormatData *im_format)
 {
        const char *extension = NULL;
+       (void)im_format;  /* may be unused, depends on build options */
 
        if (imtype == R_IMF_IMTYPE_IRIS) {
                if (!BLI_testextensie(string, ".rgb"))
@@ -1176,11 +1233,25 @@ int BKE_add_image_extension(char *string, const char imtype)
        }
 #ifdef WITH_OPENJPEG
        else if (imtype == R_IMF_IMTYPE_JP2) {
-               if (!BLI_testextensie(string, ".jp2"))
-                       extension = ".jp2";
+               if (im_format) {
+                       if (im_format->jp2_codec == R_IMF_JP2_CODEC_JP2) {
+                               if (!BLI_testextensie(string, ".jp2"))
+                                       extension = ".jp2";
+                       }
+                       else if (im_format->jp2_codec == R_IMF_JP2_CODEC_J2K) {
+                               if (!BLI_testextensie(string, ".j2c"))
+                                       extension = ".j2c";
+                       }
+                       else
+                               BLI_assert(!"Unsupported jp2 codec was specified in im_format->jp2_codec");
+               }
+               else {
+                       if (!BLI_testextensie(string, ".jp2"))
+                               extension = ".jp2";
+               }
        }
 #endif
-       else { //   R_IMF_IMTYPE_AVICODEC, R_IMF_IMTYPE_AVIRAW, R_IMF_IMTYPE_AVIJPEG, R_IMF_IMTYPE_JPEG90, R_IMF_IMTYPE_QUICKTIME etc
+       else { //   R_IMF_IMTYPE_AVIRAW, R_IMF_IMTYPE_AVIJPEG, R_IMF_IMTYPE_JPEG90, R_IMF_IMTYPE_QUICKTIME etc
                if (!(BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
                        extension = ".jpg";
        }
@@ -1203,6 +1274,16 @@ int BKE_add_image_extension(char *string, const char imtype)
        }
 }
 
+int BKE_add_image_extension(char *string, const ImageFormatData *im_format)
+{
+       return do_add_image_extension(string, im_format->imtype, im_format);
+}
+
+int BKE_add_image_extension_from_type(char *string, const char imtype)
+{
+       return do_add_image_extension(string, imtype, NULL);
+}
+
 void BKE_imformat_defaults(ImageFormatData *im_format)
 {
        memset(im_format, 0, sizeof(*im_format));
@@ -1210,47 +1291,53 @@ void BKE_imformat_defaults(ImageFormatData *im_format)
        im_format->imtype = R_IMF_IMTYPE_PNG;
        im_format->quality = 90;
        im_format->compress = 90;
+
+       BKE_color_managed_display_settings_init(&im_format->display_settings);
+       BKE_color_managed_view_settings_init(&im_format->view_settings);
 }
 
 void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *imbuf)
 {
+       int ftype        = imbuf->ftype & ~IB_CUSTOM_FLAGS_MASK;
+       int custom_flags = imbuf->ftype & IB_CUSTOM_FLAGS_MASK;
+
        BKE_imformat_defaults(im_format);
 
-       // file type
+       /* file type */
 
-       if (imbuf->ftype == IMAGIC)
+       if (ftype == IMAGIC)
                im_format->imtype = R_IMF_IMTYPE_IRIS;
 
 #ifdef WITH_HDR
-       else if (imbuf->ftype == RADHDR)
+       else if (ftype == RADHDR)
                im_format->imtype = R_IMF_IMTYPE_RADHDR;
 #endif
 
-       else if (imbuf->ftype == PNG)
+       else if (ftype == PNG)
                im_format->imtype = R_IMF_IMTYPE_PNG;
 
 #ifdef WITH_DDS
-       else if (imbuf->ftype == DDS)
+       else if (ftype == DDS)
                im_format->imtype = R_IMF_IMTYPE_DDS;
 #endif
 
-       else if (imbuf->ftype == BMP)
+       else if (ftype == BMP)
                im_format->imtype = R_IMF_IMTYPE_BMP;
 
 #ifdef WITH_TIFF
-       else if (imbuf->ftype & TIF) {
+       else if (ftype == TIF) {
                im_format->imtype = R_IMF_IMTYPE_TIFF;
-               if (imbuf->ftype & TIF_16BIT)
+               if (custom_flags & TIF_16BIT)
                        im_format->depth = R_IMF_CHAN_DEPTH_16;
        }
 #endif
 
 #ifdef WITH_OPENEXR
-       else if (imbuf->ftype & OPENEXR) {
+       else if (ftype == OPENEXR) {
                im_format->imtype = R_IMF_IMTYPE_OPENEXR;
-               if (imbuf->ftype & OPENEXR_HALF)
+               if (custom_flags & OPENEXR_HALF)
                        im_format->depth = R_IMF_CHAN_DEPTH_16;
-               if (imbuf->ftype & OPENEXR_COMPRESS)
+               if (custom_flags & OPENEXR_COMPRESS)
                        im_format->exr_codec = R_IMF_EXR_CODEC_ZIP;  // Can't determine compression
                if (imbuf->zbuf_float)
                        im_format->flag |= R_IMF_FLAG_ZBUF;
@@ -1258,46 +1345,53 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
 #endif
 
 #ifdef WITH_CINEON
-       else if (imbuf->ftype == CINEON)
+       else if (ftype == CINEON)
                im_format->imtype = R_IMF_IMTYPE_CINEON;
-       else if (imbuf->ftype == DPX)
+       else if (ftype == DPX)
                im_format->imtype = R_IMF_IMTYPE_DPX;
 #endif
 
-       else if (imbuf->ftype == TGA) {
+       else if (ftype == TGA) {
                im_format->imtype = R_IMF_IMTYPE_TARGA;
        }
-       else if (imbuf->ftype == RAWTGA) {
+       else if (ftype == RAWTGA) {
                im_format->imtype = R_IMF_IMTYPE_RAWTGA;
        }
 
 #ifdef WITH_OPENJPEG
-       else if (imbuf->ftype & JP2) {
+       else if (ftype & JP2) {
                im_format->imtype = R_IMF_IMTYPE_JP2;
-               im_format->quality = imbuf->ftype & ~JPG_MSK;
+               im_format->quality = custom_flags & ~JPG_MSK;
 
-               if (imbuf->ftype & JP2_16BIT)
+               if (ftype & JP2_16BIT)
                        im_format->depth = R_IMF_CHAN_DEPTH_16;
-               else if (imbuf->ftype & JP2_12BIT)
+               else if (ftype & JP2_12BIT)
                        im_format->depth = R_IMF_CHAN_DEPTH_12;
 
-               if (imbuf->ftype & JP2_YCC)
+               if (ftype & JP2_YCC)
                        im_format->jp2_flag |= R_IMF_JP2_FLAG_YCC;
 
-               if (imbuf->ftype & JP2_CINE) {
+               if (ftype & JP2_CINE) {
                        im_format->jp2_flag |= R_IMF_JP2_FLAG_CINE_PRESET;
-                       if (imbuf->ftype & JP2_CINE_48FPS)
+                       if (ftype & JP2_CINE_48FPS)
                                im_format->jp2_flag |= R_IMF_JP2_FLAG_CINE_48;
                }
+
+               if (ftype & JP2_JP2)
+                       im_format->jp2_codec = R_IMF_JP2_CODEC_JP2;
+               else if (ftype & JP2_J2K)
+                       im_format->jp2_codec = R_IMF_JP2_CODEC_J2K;
+               else
+                       BLI_assert(!"Unsupported jp2 codec was specified in file type");
        }
 #endif
 
        else {
                im_format->imtype = R_IMF_IMTYPE_JPEG90;
-               im_format->quality = imbuf->ftype & ~JPG_MSK;
+               im_format->quality = custom_flags & ~JPG_MSK;
        }
 
-       // planes
+       /* planes */
        switch (imbuf->channels) {
                case 0:
                case 4: im_format->planes = R_IMF_PLANES_RGBA;
@@ -1312,7 +1406,34 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
 
 }
 
-/* could allow access externally - 512 is for long names, 64 is for id names */
+static void timecode_simple_string(char *text, size_t text_size, const int cfra, int const frs_sec)
+{
+       int f = (int)(cfra % frs_sec);
+       int s = (int)(cfra / frs_sec);
+       int h = 0;
+       int m = 0;
+
+       if (s) {
+               m = (int)(s / 60);
+               s %= 60;
+
+               if (m) {
+                       h = (int)(m / 60);
+                       m %= 60;
+               }
+       }
+
+       if (frs_sec < 100) {
+               BLI_snprintf(text, text_size, "%02d:%02d:%02d.%02d", h, m, s, f);
+       }
+       else {
+               BLI_snprintf(text, text_size, "%02d:%02d:%02d.%03d", h, m, s, f);
+       }
+}
+
+#define STAMP_NAME_SIZE ((MAX_ID_NAME - 2) + 16)
+/* could allow access externally - 512 is for long names,
+ * STAMP_NAME_SIZE is for id names, allowing them some room for description */
 typedef struct StampData {
        char file[512];
        char note[512];
@@ -1320,12 +1441,13 @@ typedef struct StampData {
        char marker[512];
        char time[512];
        char frame[512];
-       char camera[64];
-       char cameralens[64];
-       char scene[64];
-       char strip[64];
-       char rendertime[64];
+       char camera[STAMP_NAME_SIZE];
+       char cameralens[STAMP_NAME_SIZE];
+       char scene[STAMP_NAME_SIZE];
+       char strip[STAMP_NAME_SIZE];
+       char rendertime[STAMP_NAME_SIZE];
 } StampData;
+#undef STAMP_NAME_SIZE
 
 static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int do_prefix)
 {
@@ -1371,26 +1493,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
        }
 
        if (scene->r.stamp & R_STAMP_TIME) {
-               int f = (int)(scene->r.cfra % scene->r.frs_sec);
-               int s = (int)(scene->r.cfra / scene->r.frs_sec);
-               int h = 0;
-               int m = 0;
-
-               if (s) {
-                       m = (int)(s / 60);
-                       s %= 60;
-
-                       if (m) {
-                               h = (int)(m / 60);
-                               m %= 60;
-                       }
-               }
-
-               if (scene->r.frs_sec < 100)
-                       BLI_snprintf(text, sizeof(text), "%02d:%02d:%02d.%02d", h, m, s, f);
-               else
-                       BLI_snprintf(text, sizeof(text), "%02d:%02d:%02d.%03d", h, m, s, f);
-
+               timecode_simple_string(text, sizeof(text), scene->r.cfra, scene->r.frs_sec);
                BLI_snprintf(stamp_data->time, sizeof(stamp_data->time), do_prefix ? "Time %s" : "%s", text);
        }
        else {
@@ -1438,7 +1541,7 @@ static void stampdata(Scene *scene, Object *camera, StampData *stamp_data, int d
        }
 
        if (scene->r.stamp & R_STAMP_SEQSTRIP) {
-               Sequence *seq = seq_foreground_frame_get(scene, scene->r.cfra);
+               Sequence *seq = BKE_sequencer_foreground_frame_get(scene, scene->r.cfra);
 
                if (seq) BLI_strncpy(text, seq->name + 2, sizeof(text));
                else BLI_strncpy(text, "<none>", sizeof(text));
@@ -1471,6 +1574,11 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
        int x, y, y_ofs;
        float h_fixed;
        const int mono = blf_mono_font_render; // XXX
+       struct ColorManagedDisplay *display;
+       const char *display_device;
+
+       /* this could be an argument if we want to operate on non linear float imbuf's
+        * for now though this is only used for renders which use scene settings */
 
 #define BUFF_MARGIN_X 2
 #define BUFF_MARGIN_Y 1
@@ -1478,6 +1586,9 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
        if (!rect && !rectf)
                return;
 
+       display_device = scene->display_settings.display_device;
+       display = IMB_colormanagement_display_get_named(display_device);
+
        stampdata(scene, camera, &stamp_data, 1);
 
        /* TODO, do_versions */
@@ -1487,7 +1598,7 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
        /* set before return */
        BLF_size(mono, scene->r.stamp_font_id, 72);
 
-       BLF_buffer(mono, rectf, rect, width, height, channels);
+       BLF_buffer(mono, rectf, rect, width, height, channels, display);
        BLF_buffer_col(mono, scene->r.fg_stamp[0], scene->r.fg_stamp[1], scene->r.fg_stamp[2], 1.0);
        pad = BLF_width_max(mono);
 
@@ -1504,7 +1615,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                y -= h;
 
                /* also a little of space to the background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and draw the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1520,7 +1632,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                y -= h;
 
                /* and space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.note);
@@ -1535,7 +1648,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                y -= h;
 
                /* and space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.date);
@@ -1550,7 +1664,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                y -= h;
 
                /* and space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 0, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.rendertime);
@@ -1564,7 +1679,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                BLF_width_and_height(mono, stamp_data.marker, &w, &h); h = h_fixed;
 
                /* extra space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp,  display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1579,7 +1695,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                BLF_width_and_height(mono, stamp_data.time, &w, &h); h = h_fixed;
 
                /* extra space for background */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1593,7 +1710,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                BLF_width_and_height(mono, stamp_data.frame, &w, &h); h = h_fixed;
 
                /* extra space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1607,7 +1725,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                BLF_width_and_height(mono, stamp_data.camera, &w, &h); h = h_fixed;
 
                /* extra space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.camera);
 
@@ -1619,7 +1738,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                BLF_width_and_height(mono, stamp_data.cameralens, &w, &h); h = h_fixed;
 
                /* extra space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.cameralens);
        }
@@ -1631,7 +1751,8 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                x = width - w - 2;
 
                /* extra space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                /* and pad the text. */
                BLF_position(mono, x, y + y_ofs, 0.0);
@@ -1646,14 +1767,15 @@ void BKE_stamp_buf(Scene *scene, Object *camera, unsigned char *rect, float *rec
                y = height - h;
 
                /* extra space for background. */
-               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
+               buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, display,
+                                 x - BUFF_MARGIN_X, y - BUFF_MARGIN_Y, x + w + BUFF_MARGIN_X, y + h + BUFF_MARGIN_Y);
 
                BLF_position(mono, x, y + y_ofs, 0.0);
                BLF_draw_buffer(mono, stamp_data.strip);
        }
 
        /* cleanup the buffer. */
-       BLF_buffer(mono, NULL, NULL, 0, 0, 0);
+       BLF_buffer(mono, NULL, NULL, 0, 0, 0, FALSE);
 
 #undef BUFF_MARGIN_X
 #undef BUFF_MARGIN_Y
@@ -1760,9 +1882,33 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name, ImageFormatData *imf)
 #ifdef WITH_CINEON
        else if (imtype == R_IMF_IMTYPE_CINEON) {
                ibuf->ftype = CINEON;
+               if (imf->cineon_flag & R_IMF_CINEON_FLAG_LOG) {
+                       ibuf->ftype |= CINEON_LOG;
+               }
+               if (imf->depth == R_IMF_CHAN_DEPTH_16) {
+                       ibuf->ftype |= CINEON_16BIT;
+               }
+               else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
+                       ibuf->ftype |= CINEON_12BIT;
+               }
+               else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
+                       ibuf->ftype |= CINEON_10BIT;
+               }
        }
        else if (imtype == R_IMF_IMTYPE_DPX) {
                ibuf->ftype = DPX;
+               if (imf->cineon_flag & R_IMF_CINEON_FLAG_LOG) {
+                 ibuf->ftype |= CINEON_LOG;
+               }
+               if (imf->depth == R_IMF_CHAN_DEPTH_16) {
+                       ibuf->ftype |= CINEON_16BIT;
+               }
+               else if (imf->depth == R_IMF_CHAN_DEPTH_12) {
+                       ibuf->ftype |= CINEON_12BIT;
+               }
+               else if (imf->depth == R_IMF_CHAN_DEPTH_10) {
+                       ibuf->ftype |= CINEON_10BIT;
+               }
        }
 #endif
        else if (imtype == R_IMF_IMTYPE_TARGA) {
@@ -1792,6 +1938,13 @@ int BKE_imbuf_write(ImBuf *ibuf, const char *name, ImageFormatData *imf)
                        if (imf->jp2_flag & R_IMF_JP2_FLAG_CINE_48)
                                ibuf->ftype |= JP2_CINE_48FPS;
                }
+
+               if (imf->jp2_codec == R_IMF_JP2_CODEC_JP2)
+                       ibuf->ftype |= JP2_JP2;
+               else if (imf->jp2_codec == R_IMF_JP2_CODEC_J2K)
+                       ibuf->ftype |= JP2_J2K;
+               else
+                       BLI_assert(!"Unsupported jp2 codec was specified in im_format->jp2_codec");
        }
 #endif
        else {
@@ -1842,7 +1995,8 @@ int BKE_imbuf_write_stamp(Scene *scene, struct Object *camera, ImBuf *ibuf, cons
 }
 
 
-void BKE_makepicstring(char *string, const char *base, const char *relbase, int frame, const char imtype, const short use_ext, const short use_frames)
+static void do_makepicstring(char *string, const char *base, const char *relbase, int frame, const char imtype,
+                             const ImageFormatData *im_format, const short use_ext, const short use_frames)
 {
        if (string == NULL) return;
        BLI_strncpy(string, base, FILE_MAX - 10);   /* weak assumption */
@@ -1852,17 +2006,26 @@ void BKE_makepicstring(char *string, const char *base, const char *relbase, int
                BLI_path_frame(string, frame, 4);
 
        if (use_ext)
-               BKE_add_image_extension(string, imtype);
+               do_add_image_extension(string, imtype, im_format);
+}
+
+void BKE_makepicstring(char *string, const char *base, const char *relbase, int frame, const ImageFormatData *im_format, const short use_ext, const short use_frames)
+{
+       do_makepicstring(string, base, relbase, frame, im_format->imtype, im_format, use_ext, use_frames);
+}
 
+void BKE_makepicstring_from_type(char *string, const char *base, const char *relbase, int frame, const char imtype, const short use_ext, const short use_frames)
+{
+       do_makepicstring(string, base, relbase, frame, imtype, NULL, use_ext, use_frames);
 }
 
 /* used by sequencer too */
-struct anim *openanim(const char *name, int flags, int streamindex)
+struct anim *openanim(const char *name, int flags, int streamindex, char colorspace[IMA_MAX_SPACE])
 {
        struct anim *anim;
        struct ImBuf *ibuf;
 
-       anim = IMB_open_anim(name, flags, streamindex);
+       anim = IMB_open_anim(name, flags, streamindex, colorspace);
        if (anim == NULL) return NULL;
 
        ibuf = IMB_anim_absolute(anim, 0, IMB_TC_NONE, IMB_PROXY_NONE);
@@ -1990,6 +2153,8 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
        if (ima == NULL)
                return;
 
+       BLI_spin_lock(&image_spin);
+
        switch (signal) {
                case IMA_SIGNAL_FREE:
                        image_free_buffers(ima);
@@ -2055,8 +2220,19 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
                                }
                        }
                        break;
+               case IMA_SIGNAL_COLORMANAGE:
+                       image_free_buffers(ima);
+
+                       ima->ok = 1;
+
+                       if (iuser)
+                               iuser->ok = 1;
+
+                       break;
        }
 
+       BLI_spin_unlock(&image_spin);
+
        /* don't use notifiers because they are not 100% sure to succeeded
         * this also makes sure all scenes are accounted for. */
        {
@@ -2123,7 +2299,9 @@ RenderResult *BKE_image_acquire_renderresult(Scene *scene, Image *ima)
 
 void BKE_image_release_renderresult(Scene *scene, Image *ima)
 {
-       if (ima->rr) ;
+       if (ima->rr) {
+               /* pass */
+       }
        else if (ima->type == IMA_TYPE_R_RESULT) {
                if (ima->render_slot == ima->last_render_slot)
                        RE_ReleaseResult(RE_GetRender(scene->id.name));
@@ -2154,8 +2332,10 @@ void BKE_image_backup_render(Scene *scene, Image *ima)
 /* in that case we have to build a render-result */
 static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr)
 {
+       const char *colorspace = ima->colorspace_settings.name;
+       int predivide = ima->flag & IMA_CM_PREDIVIDE;
 
-       ima->rr = RE_MultilayerConvert(ibuf->userdata, ibuf->x, ibuf->y);
+       ima->rr = RE_MultilayerConvert(ibuf->userdata, colorspace, predivide, ibuf->x, ibuf->y);
 
 #ifdef WITH_OPENEXR
        IMB_exr_close(ibuf->userdata);
@@ -2203,7 +2383,7 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
                flag |= IB_premul;
 
        /* read ibuf */
-       ibuf = IMB_loadiffname(name, flag);
+       ibuf = IMB_loadiffname(name, flag, ima->colorspace_settings.name);
 
 #if 0
        if (ibuf) {
@@ -2216,7 +2396,7 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
 
        if (ibuf) {
 #ifdef WITH_OPENEXR
-               /* handle multilayer case, don't assign ibuf. will be handled in BKE_image_get_ibuf */
+               /* handle multilayer case, don't assign ibuf. will be handled in BKE_image_acquire_ibuf */
                if (ibuf->ftype == OPENEXR && ibuf->userdata) {
                        image_create_multilayer(ima, ibuf, frame);
                        ima->type = IMA_TYPE_MULTILAYER;
@@ -2281,7 +2461,6 @@ static ImBuf *image_load_sequence_multilayer(Image *ima, ImageUser *iuser, int f
                        ibuf->flags |= IB_rectfloat;
                        ibuf->mall = IB_rectfloat;
                        ibuf->channels = rpass->channels;
-                       ibuf->profile = IB_PROFILE_LINEAR_RGB;
 
                        image_initialize_after_load(ima, ibuf);
                        image_assign_ibuf(ima, ibuf, iuser ? iuser->multi_index : 0, frame);
@@ -2311,7 +2490,7 @@ static ImBuf *image_load_movie_file(Image *ima, ImageUser *iuser, int frame)
                BKE_image_user_file_path(iuser, ima, str);
 
                /* FIXME: make several stream accessible in image editor, too*/
-               ima->anim = openanim(str, IB_rect, 0);
+               ima->anim = openanim(str, IB_rect, 0, ima->colorspace_settings.name);
 
                /* let's initialize this user */
                if (ima->anim && iuser && iuser->frames == 0)
@@ -2362,8 +2541,8 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
                flag = IB_rect | IB_multilayer;
                if (ima->flag & IMA_DO_PREMUL) flag |= IB_premul;
 
-               ibuf = IMB_ibImageFromMemory((unsigned char *)ima->packedfile->data,
-                                            ima->packedfile->size, flag, "<packed data>");
+               ibuf = IMB_ibImageFromMemory((unsigned char *)ima->packedfile->data, ima->packedfile->size, flag,
+                                            ima->colorspace_settings.name, "<packed data>");
        }
        else {
                flag = IB_rect | IB_multilayer | IB_metadata;
@@ -2375,11 +2554,11 @@ static ImBuf *image_load_image_file(Image *ima, ImageUser *iuser, int cfra)
                BKE_image_user_file_path(iuser, ima, str);
 
                /* read ibuf */
-               ibuf = IMB_loadiffname(str, flag);
+               ibuf = IMB_loadiffname(str, flag, ima->colorspace_settings.name);
        }
 
        if (ibuf) {
-               /* handle multilayer case, don't assign ibuf. will be handled in BKE_image_get_ibuf */
+               /* handle multilayer case, don't assign ibuf. will be handled in BKE_image_acquire_ibuf */
                if (ibuf->ftype == OPENEXR && ibuf->userdata) {
                        image_create_multilayer(ima, ibuf, cfra);
                        ima->type = IMA_TYPE_MULTILAYER;
@@ -2432,7 +2611,6 @@ static ImBuf *image_get_ibuf_multilayer(Image *ima, ImageUser *iuser)
                        ibuf->rect_float = rpass->rect;
                        ibuf->flags |= IB_rectfloat;
                        ibuf->channels = rpass->channels;
-                       ibuf->profile = IB_PROFILE_LINEAR_RGB;
 
                        image_assign_ibuf(ima, ibuf, iuser ? iuser->multi_index : IMA_NO_INDEX, 0);
                }
@@ -2496,14 +2674,16 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
                *lock_r = re;
        }
 
-       /* this gives active layer, composite or seqence result */
+       /* this gives active layer, composite or sequence result */
        rect = (unsigned int *)rres.rect32;
        rectf = rres.rectf;
        rectz = rres.rectz;
        dither = iuser->scene->r.dither_intensity;
 
        /* combined layer gets added as first layer */
-       if (rres.have_combined && layer == 0) ;
+       if (rres.have_combined && layer == 0) {
+               /* pass */
+       }
        else if (rres.layers.first) {
                RenderLayer *rl = BLI_findlink(&rres.layers, layer - (rres.have_combined ? 1 : 0));
                if (rl) {
@@ -2536,17 +2716,33 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
                image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
        }
 
+       /* invalidate color managed buffers if render result changed */
+       BLI_lock_thread(LOCK_COLORMANAGE);
+       if (ibuf->x != rres.rectx || ibuf->y != rres.recty || ibuf->rect_float != rectf) {
+               ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
+       }
+
        ibuf->x = rres.rectx;
        ibuf->y = rres.recty;
 
        /* free rect buffer if float buffer changes, so it can be recreated with
         * the updated result, and also in case we got byte buffer from sequencer,
         * so we don't keep reference to freed buffer */
-       if (ibuf->rect_float != rectf || rect || !rectf)
+       if (ibuf->rect_float != rectf || rect)
                imb_freerectImBuf(ibuf);
 
-       if (rect)
+       if (rect) {
                ibuf->rect = rect;
+       }
+       else {
+               /* byte buffer of render result has been freed, make sure image buffers
+                * does not reference to this buffer anymore
+                * need check for whether byte buffer was allocated and owned by image itself
+                * or if it's reusing buffer from render result
+                */
+               if ((ibuf->mall & IB_rect) == 0)
+                       ibuf->rect = NULL;
+       }
 
        if (rectf) {
                ibuf->rect_float = rectf;
@@ -2567,8 +2763,8 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_
                ibuf->flags &= ~IB_zbuffloat;
        }
 
-       /* since its possible to access the buffer from the image directly, set the profile [#25073] */
-       ibuf->profile = (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) ? IB_PROFILE_LINEAR_RGB : IB_PROFILE_NONE;
+       BLI_unlock_thread(LOCK_COLORMANAGE);
+
        ibuf->dither = dither;
 
        if (iuser->scene->r.color_mgt_flag & R_COLOR_MANAGEMENT_PREDIVIDE) {
@@ -2631,38 +2827,32 @@ static ImBuf *image_get_ibuf_threadsafe(Image *ima, ImageUser *iuser, int *frame
                 * a big bottleneck */
        }
 
-       *frame_r = frame;
-       *index_r = index;
+       if (frame_r)
+               *frame_r = frame;
+
+       if (index_r)
+               *index_r = index;
 
        return ibuf;
 }
 
-/* Checks optional ImageUser and verifies/creates ImBuf. */
-/* use this one if you want to get a render result in progress,
- * if not, use BKE_image_get_ibuf which doesn't require a release */
-ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
+/* Checks optional ImageUser and verifies/creates ImBuf.
+ *
+ * not thread-safe, so callee should worry about thread locks
+ */
+static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 {
        ImBuf *ibuf = NULL;
        float color[] = {0, 0, 0, 1};
        int frame = 0, index = 0;
 
-       /* This function is intended to be thread-safe. It postpones the mutex lock
-        * until it needs to load the image, if the image is already there it
-        * should just get the pointer and return. The reason is that a lot of mutex
-        * locks appears to be very slow on certain multicore macs, causing a render
-        * with image textures to actually slow down as more threads are used.
-        *
-        * Note that all the image loading functions should also make sure they do
-        * things in a threadsafe way for image_get_ibuf_threadsafe to work correct.
-        * That means, the last two steps must be, 1) add the ibuf to the list and
-        * 2) set ima/iuser->ok to 0 to IMA_OK_LOADED */
-
        if (lock_r)
                *lock_r = NULL;
 
        /* quick reject tests */
        if (ima == NULL)
                return NULL;
+
        if (iuser) {
                if (iuser->ok == 0)
                        return NULL;
@@ -2670,94 +2860,71 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
        else if (ima->ok == 0)
                return NULL;
 
-       /* try to get the ibuf without locking */
        ibuf = image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
 
        if (ibuf == NULL) {
-               /* couldn't get ibuf and image is not ok, so let's lock and try to
-                * load the image */
-               BLI_lock_thread(LOCK_IMAGE);
-
-               /* need to check ok flag and loading ibuf again, because the situation
-                * might have changed in the meantime */
-               if (iuser) {
-                       if (iuser->ok == 0) {
-                               BLI_unlock_thread(LOCK_IMAGE);
-                               return NULL;
-                       }
-               }
-               else if (ima->ok == 0) {
-                       BLI_unlock_thread(LOCK_IMAGE);
-                       return NULL;
+               /* we are sure we have to load the ibuf, using source and type */
+               if (ima->source == IMA_SRC_MOVIE) {
+                       /* source is from single file, use flipbook to store ibuf */
+                       ibuf = image_load_movie_file(ima, iuser, frame);
                }
-
-               ibuf = image_get_ibuf_threadsafe(ima, iuser, &frame, &index);
-
-               if (ibuf == NULL) {
-                       /* we are sure we have to load the ibuf, using source and type */
-                       if (ima->source == IMA_SRC_MOVIE) {
-                               /* source is from single file, use flipbook to store ibuf */
-                               ibuf = image_load_movie_file(ima, iuser, frame);
+               else if (ima->source == IMA_SRC_SEQUENCE) {
+                       if (ima->type == IMA_TYPE_IMAGE) {
+                               /* regular files, ibufs in flipbook, allows saving */
+                               ibuf = image_load_sequence_file(ima, iuser, frame);
                        }
-                       else if (ima->source == IMA_SRC_SEQUENCE) {
-                               if (ima->type == IMA_TYPE_IMAGE) {
-                                       /* regular files, ibufs in flipbook, allows saving */
-                                       ibuf = image_load_sequence_file(ima, iuser, frame);
-                               }
-                               /* no else; on load the ima type can change */
-                               if (ima->type == IMA_TYPE_MULTILAYER) {
-                                       /* only 1 layer/pass stored in imbufs, no exrhandle anim storage, no saving */
-                                       ibuf = image_load_sequence_multilayer(ima, iuser, frame);
-                               }
+                       /* no else; on load the ima type can change */
+                       if (ima->type == IMA_TYPE_MULTILAYER) {
+                               /* only 1 layer/pass stored in imbufs, no exrhandle anim storage, no saving */
+                               ibuf = image_load_sequence_multilayer(ima, iuser, frame);
                        }
-                       else if (ima->source == IMA_SRC_FILE) {
+               }
+               else if (ima->source == IMA_SRC_FILE) {
 
-                               if (ima->type == IMA_TYPE_IMAGE)
-                                       ibuf = image_load_image_file(ima, iuser, frame);  /* cfra only for '#', this global is OK */
-                               /* no else; on load the ima type can change */
-                               if (ima->type == IMA_TYPE_MULTILAYER)
-                                       /* keeps render result, stores ibufs in listbase, allows saving */
-                                       ibuf = image_get_ibuf_multilayer(ima, iuser);
+                       if (ima->type == IMA_TYPE_IMAGE)
+                               ibuf = image_load_image_file(ima, iuser, frame);  /* cfra only for '#', this global is OK */
+                       /* no else; on load the ima type can change */
+                       if (ima->type == IMA_TYPE_MULTILAYER)
+                               /* keeps render result, stores ibufs in listbase, allows saving */
+                               ibuf = image_get_ibuf_multilayer(ima, iuser);
 
+               }
+               else if (ima->source == IMA_SRC_GENERATED) {
+                       /* generated is: ibuf is allocated dynamically */
+                       /* UV testgrid or black or solid etc */
+                       if (ima->gen_x == 0) ima->gen_x = 1024;
+                       if (ima->gen_y == 0) ima->gen_y = 1024;
+                       ibuf = add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, (ima->gen_flag & IMA_GEN_FLOAT) != 0, ima->gen_type,
+                                            color, &ima->colorspace_settings);
+                       image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
+                       ima->ok = IMA_OK_LOADED;
+               }
+               else if (ima->source == IMA_SRC_VIEWER) {
+                       if (ima->type == IMA_TYPE_R_RESULT) {
+                               /* always verify entirely, and potentially
+                                * returns pointer to release later */
+                               ibuf = image_get_render_result(ima, iuser, lock_r);
                        }
-                       else if (ima->source == IMA_SRC_GENERATED) {
-                               /* generated is: ibuf is allocated dynamically */
-                               /* UV testgrid or black or solid etc */
-                               if (ima->gen_x == 0) ima->gen_x = 1024;
-                               if (ima->gen_y == 0) ima->gen_y = 1024;
-                               ibuf = add_ibuf_size(ima->gen_x, ima->gen_y, ima->name, 24, (ima->gen_flag & IMA_GEN_FLOAT) != 0, ima->gen_type, color);
-                               image_assign_ibuf(ima, ibuf, IMA_NO_INDEX, 0);
-                               ima->ok = IMA_OK_LOADED;
-                       }
-                       else if (ima->source == IMA_SRC_VIEWER) {
-                               if (ima->type == IMA_TYPE_R_RESULT) {
-                                       /* always verify entirely, and potentially
-                                        * returns pointer to release later */
-                                       ibuf = image_get_render_result(ima, iuser, lock_r);
-                               }
-                               else if (ima->type == IMA_TYPE_COMPOSITE) {
-                                       /* requires lock/unlock, otherwise don't return image */
-                                       if (lock_r) {
-                                               /* unlock in BKE_image_release_ibuf */
-                                               BLI_lock_thread(LOCK_VIEWER);
-                                               *lock_r = ima;
-
-                                               /* XXX anim play for viewer nodes not yet supported */
-                                               frame = 0; // XXX iuser?iuser->framenr:0;
-                                               ibuf = image_get_ibuf(ima, 0, frame);
-
-                                               if (!ibuf) {
-                                                       /* Composite Viewer, all handled in compositor */
-                                                       /* fake ibuf, will be filled in compositor */
-                                                       ibuf = IMB_allocImBuf(256, 256, 32, IB_rect);
-                                                       image_assign_ibuf(ima, ibuf, 0, frame);
-                                               }
+                       else if (ima->type == IMA_TYPE_COMPOSITE) {
+                               /* requires lock/unlock, otherwise don't return image */
+                               if (lock_r) {
+                                       /* unlock in BKE_image_release_ibuf */
+                                       BLI_lock_thread(LOCK_VIEWER);
+                                       *lock_r = ima;
+
+                                       /* XXX anim play for viewer nodes not yet supported */
+                                       frame = 0; // XXX iuser?iuser->framenr:0;
+                                       ibuf = image_get_ibuf(ima, 0, frame);
+
+                                       if (!ibuf) {
+                                               /* Composite Viewer, all handled in compositor */
+                                               /* fake ibuf, will be filled in compositor */
+                                               ibuf = IMB_allocImBuf(256, 256, 32, IB_rect);
+                                               image_assign_ibuf(ima, ibuf, 0, frame);
                                        }
                                }
                        }
                }
-
-               BLI_unlock_thread(LOCK_IMAGE);
        }
 
        BKE_image_tag_time(ima);
@@ -2765,29 +2932,89 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
        return ibuf;
 }
 
-void BKE_image_release_ibuf(Image *ima, void *lock)
+/* return image buffer for given image and user
+ *
+ * - will lock render result if image type is render result and lock is not NULL
+ * - will return NULL if image type if render or composite result and lock is NULL
+ *
+ * references the result, BKE_image_release_ibuf should be used to de-reference
+ */
+ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r)
 {
-       /* for getting image during threaded render / compositing, need to release */
-       if (lock == ima) {
-               BLI_unlock_thread(LOCK_VIEWER); /* viewer image */
+       ImBuf *ibuf;
+
+       BLI_spin_lock(&image_spin);
+
+       ibuf = image_acquire_ibuf(ima, iuser, lock_r);
+
+       if (ibuf)
+               IMB_refImBuf(ibuf);
+
+       BLI_spin_unlock(&image_spin);
+
+       return ibuf;
+}
+
+void BKE_image_release_ibuf(Image *ima, ImBuf *ibuf, void *lock)
+{
+       if (lock) {
+               /* for getting image during threaded render / compositing, need to release */
+               if (lock == ima) {
+                       BLI_unlock_thread(LOCK_VIEWER); /* viewer image */
+               }
+               else if (lock) {
+                       RE_ReleaseResultImage(lock); /* render result */
+                       BLI_unlock_thread(LOCK_VIEWER); /* view image imbuf */
+               }
        }
-       else if (lock) {
-               RE_ReleaseResultImage(lock); /* render result */
-               BLI_unlock_thread(LOCK_VIEWER); /* view image imbuf */
+
+       if (ibuf) {
+               BLI_spin_lock(&image_spin);
+               IMB_freeImBuf(ibuf);
+               BLI_spin_unlock(&image_spin);
        }
 }
 
-/* warning, this can allocate generated images */
-ImBuf *BKE_image_get_ibuf(Image *ima, ImageUser *iuser)
+/* checks whether there's an image buffer for given image and user */
+int BKE_image_has_ibuf(Image *ima, ImageUser *iuser)
 {
-       /* here (+fie_ima/2-1) makes sure that division happens correctly */
-       return BKE_image_acquire_ibuf(ima, iuser, NULL);
+       ImBuf *ibuf;
+
+       /* quick reject tests */
+       if (ima == NULL)
+               return FALSE;
+
+       if (iuser) {
+               if (iuser->ok == 0)
+                       return FALSE;
+       }
+       else if (ima->ok == 0)
+               return FALSE;
+
+       ibuf = image_get_ibuf_threadsafe(ima, iuser, NULL, NULL);
+
+       if (!ibuf) {
+               BLI_spin_lock(&image_spin);
+
+               ibuf = image_get_ibuf_threadsafe(ima, iuser, NULL, NULL);
+
+               if (!ibuf)
+                       ibuf = image_acquire_ibuf(ima, iuser, NULL);
+
+               BLI_spin_unlock(&image_spin);
+       }
+
+       return ibuf != NULL;
 }
 
-int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
+int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr, short *r_is_in_range)
 {
        const int len = (iuser->fie_ima * iuser->frames) / 2;
 
+       if (r_is_in_range) {
+               *r_is_in_range = FALSE;
+       }
+
        if (len == 0) {
                return 0;
        }
@@ -2800,10 +3027,23 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
                        cfra = ((cfra) % len);
                        if (cfra < 0) cfra += len;
                        if (cfra == 0) cfra = len;
+
+                       if (r_is_in_range) {
+                               *r_is_in_range = TRUE;
+                       }
                }
 
-               if (cfra < 0) cfra = 0;
-               else if (cfra > len) cfra = len;
+               if (cfra < 0) {
+                       cfra = 0;
+               }
+               else if (cfra > len) {
+                       cfra = len;
+               }
+               else {
+                       if (r_is_in_range) {
+                               *r_is_in_range = TRUE;
+                       }
+               }
 
                /* convert current frame to current field */
                cfra = 2 * (cfra);
@@ -2812,7 +3052,6 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
                /* transform to images space */
                framenr = (cfra + iuser->fie_ima - 2) / iuser->fie_ima;
                if (framenr > iuser->frames) framenr = iuser->frames;
-               framenr += iuser->offset;
 
                if (iuser->cycl) {
                        framenr = ((framenr) % len);
@@ -2820,6 +3059,9 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
                        if (framenr == 0) framenr = len;
                }
 
+               /* important to apply after else we cant loop on frames 100 - 110 for eg. */
+               framenr += iuser->offset;
+
                return framenr;
        }
 }
@@ -2827,7 +3069,15 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, int fieldnr)
 void BKE_image_user_frame_calc(ImageUser *iuser, int cfra, int fieldnr)
 {
        if (iuser) {
-               const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr);
+               short is_in_range;
+               const int framenr = BKE_image_user_frame_get(iuser, cfra, fieldnr, &is_in_range);
+
+               if (is_in_range) {
+                       iuser->flag |= IMA_USER_FRAME_IN_RANGE;
+               }
+               else {
+                       iuser->flag &= ~IMA_USER_FRAME_IN_RANGE;
+               }
 
                /* allows image users to handle redraws */
                if (iuser->flag & IMA_ANIM_ALWAYS)
@@ -2872,10 +3122,50 @@ int BKE_image_has_alpha(struct Image *image)
 
        ibuf = BKE_image_acquire_ibuf(image, NULL, &lock);
        planes = (ibuf ? ibuf->planes : 0);
-       BKE_image_release_ibuf(image, lock);
+       BKE_image_release_ibuf(image, ibuf, lock);
 
        if (planes == 32)
                return 1;
        else
                return 0;
 }
+
+void BKE_image_get_size(Image *image, ImageUser *iuser, int *width, int *height)
+{
+       ImBuf *ibuf = NULL;
+       void *lock;
+
+       ibuf = BKE_image_acquire_ibuf(image, iuser, &lock);
+
+       if (ibuf && ibuf->x > 0 && ibuf->y > 0) {
+               *width = ibuf->x;
+               *height = ibuf->y;
+       }
+       else {
+               *width  = IMG_SIZE_FALLBACK;
+               *height = IMG_SIZE_FALLBACK;
+       }
+
+       BKE_image_release_ibuf(image, ibuf, lock);
+}
+
+void BKE_image_get_size_fl(Image *image, ImageUser *iuser, float size[2])
+{
+       int width, height;
+       BKE_image_get_size(image, iuser, &width, &height);
+
+       size[0] = (float)width;
+       size[1] = (float)height;
+
+}
+
+void BKE_image_get_aspect(Image *image, float *aspx, float *aspy)
+{
+       *aspx = 1.0;
+
+       /* x is always 1 */
+       if (image)
+               *aspy = image->aspy / image->aspx;
+       else
+               *aspy = 1.0f;
+}