orthanc-wsi: Framework/ImageToolbox.cpp comparison

Support of grayscale images

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 02 Aug 2019 15:31:19 +0200
parents	605247fc8758
children	e3cbf890b588

comparison

equal deleted inserted replaced

-:de783db2a7c3
+:cea9a4701fce
 source.GetFormat() != Orthanc::PixelFormat_RGBA32)  // 16bpp is not supported (*)
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
 }
-unsigned int channelsCount = source.GetBytesPerPixel();  // OK tx (*)
+const unsigned int bytesPerPixel = source.GetBytesPerPixel();  // Corresponds to the number of channels tx (*)
-std::auto_ptr<Orthanc::ImageAccessor> result(Allocate(source.GetFormat(),
+std::auto_ptr<Orthanc::ImageAccessor> target(Allocate(source.GetFormat(),
 source.GetWidth() / 2,
 source.GetHeight() / 2));
-unsigned int bytesPerPixel = source.GetBytesPerPixel();
+for (unsigned int y = 0; y < target->GetHeight(); y++)
+{
-for (unsigned int y = 0; y < source.GetHeight() / 2; y++)
+uint8_t* q = reinterpret_cast<uint8_t*>(target->GetRow(y));
-{
-uint8_t* q = reinterpret_cast<uint8_t*>(result->GetRow(y));
+for (unsigned int x = 0; x < target->GetWidth(); x++, q += bytesPerPixel)
+{
-for (unsigned int x = 0; x < source.GetWidth() / 2; x++, q += 3)
+for (unsigned int c = 0; c < bytesPerPixel; c++)
-{
-for (unsigned int c = 0; c < channelsCount; c++)
 {
 if (smooth)
 {
 q[c] = SmoothPixelValue(source, 2 * x, 2 * y, c, bytesPerPixel);
 }
 }
 }
 }
 }
-return result.release();
+return target.release();
 }
 Orthanc::ImageAccessor* Clone(const Orthanc::ImageAccessor& accessor)
 {

Mercurial > hg > orthanc-wsi