Mercurial > hg > orthanc-wsi

comparison Framework/Jpeg2000Reader.cpp @ 124:24bd36849c56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support more colorspaces with JPEG2k
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 15 Jan 2018 09:36:39 +0100
parents a51dee6a1515
children a0f9a3df1110
comparison
equal deleted inserted replaced
123:e8fe7c9a7d6c 124:24bd36849c56
384 384
385 unsigned int width = static_cast<unsigned int>(image_->x1); 385 unsigned int width = static_cast<unsigned int>(image_->x1);
386 unsigned int height = static_cast<unsigned int>(image_->y1); 386 unsigned int height = static_cast<unsigned int>(image_->y1);
387 387
388 Orthanc::PixelFormat format; 388 Orthanc::PixelFormat format;
389 if (image_->numcomps == 1 && image_->color_space != OPJ_CLRSPC_GRAY) 389 if (image_->numcomps == 1 /*&& image_->color_space != OPJ_CLRSPC_GRAY*/)
390 { 390 {
391 format = Orthanc::PixelFormat_Grayscale8; 391 format = Orthanc::PixelFormat_Grayscale8;
392 } 392 }
393 else if (image_->numcomps == 3 && image_->color_space != OPJ_CLRSPC_SRGB) 393 else if (image_->numcomps == 3 /*&& image_->color_space == OPJ_CLRSPC_SRGB*/)
394 { 394 {
395 format = Orthanc::PixelFormat_RGB24; 395 format = Orthanc::PixelFormat_RGB24;
396 } 396 }
397 else 397 else
398 { 398 {