Mercurial > hg > orthanc-wsi
changeset 124:24bd36849c56
Support more colorspaces with JPEG2k
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 15 Jan 2018 09:36:39 +0100 |
| parents | e8fe7c9a7d6c |
| children | 7a3f4d580625 |
| files | Framework/Jpeg2000Reader.cpp NEWS |
| diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Framework/Jpeg2000Reader.cpp Fri Jan 05 10:15:08 2018 +0100 +++ b/Framework/Jpeg2000Reader.cpp Mon Jan 15 09:36:39 2018 +0100 @@ -386,11 +386,11 @@ unsigned int height = static_cast<unsigned int>(image_->y1); Orthanc::PixelFormat format; - if (image_->numcomps == 1 && image_->color_space != OPJ_CLRSPC_GRAY) + if (image_->numcomps == 1 /*&& image_->color_space != OPJ_CLRSPC_GRAY*/) { format = Orthanc::PixelFormat_Grayscale8; } - else if (image_->numcomps == 3 && image_->color_space != OPJ_CLRSPC_SRGB) + else if (image_->numcomps == 3 /*&& image_->color_space == OPJ_CLRSPC_SRGB*/) { format = Orthanc::PixelFormat_RGB24; }
--- a/NEWS Fri Jan 05 10:15:08 2018 +0100 +++ b/NEWS Mon Jan 15 09:36:39 2018 +0100 @@ -2,6 +2,7 @@ =============================== * "--max-size=0" allowed to create a single instance per pyramid level +* Support more colorspaces with JPEG2k * Fix Debian #876807 (orthanc-wsi FTBFS with libopenjp2-7-dev 2.2.0-1) * Support of OpenBSD and FreeBSD * Support of Linux Standard Base