- 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;
+ shared_ptr<Image> image = make_shared<Image> (pixel_format(), _size, true);
+
+ /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
+ the data is 12-bit either way.
+ */
+
+ int p = 0;
+ for (int y = 0; y < _j2k->size().height; ++y) {
+ uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
+ for (int x = 0; x < _j2k->size().width; ++x) {
+ for (int c = 0; c < 3; ++c) {
+ *q++ = _j2k->data(c)[p] << 4;