- dcp::xyz_to_rgb (xyz, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
+ if (oj->opj_image()->color_space == CLRSPC_SRGB) {
+ /* No XYZ -> RGB conversion necessary; just copy and interleave the values */
+ int p = 0;
+ for (int y = 0; y < oj->size().height; ++y) {
+ uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
+ for (int x = 0; x < oj->size().width; ++x) {
+ for (int c = 0; c < 3; ++c) {
+ *q++ = oj->data(c)[p] << 4;
+ }
+ ++p;
+ }
+ }
+ } else {
+ dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
+ }