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:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-07-27 23:41:54 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-07-27 23:41:54 +0300
commit73676e57a1d6eedea25112743f6fd1ae15c0b768 (patch)
tree001338c8765706df9ea4ee6addaf7b1ed74ea47d
parent72e821bacc5090368811c2207faf1d0edc42e9c9 (diff)
Gooseberry farm: Correction to previous commitgooseberry_farm
Initial patch was done against imbuf with ftype refactor applied.
-rw-r--r--source/blender/imbuf/intern/jp2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index e8dd8a8c200..e3a08d610fe 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -616,7 +616,7 @@ static opj_image_t *ibuftoimage(ImBuf *ibuf, opj_cparameters_t *parameters)
cinema_parameters(parameters);
}
- color_space = (ibuf->foptions.flag & JP2_YCC) ? CLRSPC_SYCC : CLRSPC_SRGB;
+ color_space = (ibuf->ftype & JP2_YCC) ? CLRSPC_SYCC : CLRSPC_SRGB;
prec = 12;
numcomps = 3;
}