# HG changeset patch # User Sebastien Jodogne # Date 1399386921 -7200 # Node ID 262feb14f92fa0a6e2079d36f10071c91e125650 # Parent ecedd89055db0fe38d52907a68b0f67abe5d9851 NEWS diff -r ecedd89055db -r 262feb14f92f Core/ImageFormats/ImageBuffer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Core/ImageFormats/ImageBuffer.cpp Tue May 06 16:35:21 2014 +0200 @@ -0,0 +1,108 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, + * Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#include "ImageBuffer.h" + +namespace Orthanc +{ + void ImageBuffer::Allocate() + { + if (changed_) + { + pitch_ = GetBytesPerPixel() * width_; + + data_.resize(pitch_ * height_); + if (data_.size() > 0) + { + buffer_ = &data_[0]; + } + else + { + buffer_ = 0; + } + + changed_ = false; + } + } + + + ImageBuffer::ImageBuffer() : changed_(false) + { + changed_ = false; + format_ = PixelFormat_Grayscale8; + width_ = 0; + height_ = 0; + pitch_ = 0; + buffer_ = NULL; + } + + + void ImageBuffer::SetFormat(PixelFormat format) + { + changed_ = true; + format_ = format; + } + + + void ImageBuffer::SetWidth(unsigned int width) + { + changed_ = true; + width_ = width; + } + + + void ImageBuffer::SetHeight(unsigned int height) + { + changed_ = true; + height_ = height; + } + + + ImageAccessor ImageBuffer::GetAccessor() + { + Allocate(); + + ImageAccessor accessor; + accessor.AssignWritable(format_, width_, height_, pitch_, buffer_); + return accessor; + } + + + ImageAccessor ImageBuffer::GetConstAccessor() + { + Allocate(); + + ImageAccessor accessor; + accessor.AssignReadOnly(format_, width_, height_, pitch_, buffer_); + return accessor; + } +} diff -r ecedd89055db -r 262feb14f92f Core/ImageFormats/ImageBuffer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Core/ImageFormats/ImageBuffer.h Tue May 06 16:35:21 2014 +0200 @@ -0,0 +1,89 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, + * Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * In addition, as a special exception, the copyright holders of this + * program give permission to link the code of its release with the + * OpenSSL project's "OpenSSL" library (or with modified versions of it + * that use the same license as the "OpenSSL" library), and distribute + * the linked executables. You must obey the GNU General Public License + * in all respects for all of the code used other than "OpenSSL". If you + * modify file(s) with this exception, you may extend this exception to + * your version of the file(s), but you are not obligated to do so. If + * you do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source files + * in the program, then also delete it here. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + **/ + + +#pragma once + +#include "ImageAccessor.h" + +#include +#include + +namespace Orthanc +{ + class ImageBuffer + { + private: + bool changed_; + std::vector data_; + + PixelFormat format_; + unsigned int width_; + unsigned int height_; + unsigned int pitch_; + uint8_t *buffer_; + + void Allocate(); + + public: + ImageBuffer(); + + PixelFormat GetFormat() const + { + return format_; + } + + void SetFormat(PixelFormat format); + + unsigned int GetWidth() const + { + return width_; + } + + void SetWidth(unsigned int width); + + unsigned int GetHeight() const + { + return height_; + } + + void SetHeight(unsigned int height); + + unsigned int GetBytesPerPixel() const + { + return ::Orthanc::GetBytesPerPixel(format_); + } + + ImageAccessor GetAccessor(); + + ImageAccessor GetConstAccessor(); + }; +} diff -r ecedd89055db -r 262feb14f92f NEWS --- a/NEWS Tue May 06 16:33:40 2014 +0200 +++ b/NEWS Tue May 06 16:35:21 2014 +0200 @@ -3,6 +3,7 @@ * Dynamic negotiation of SOP classes for C-Store SCU * Creation of DICOM instances using the REST API +* Embedding of images within DICOM instances * Reuse of the previous SCU connection to avoid unecessary handshakes * Fix missing licensing terms about reuse of some code from DCMTK * Various code refactorings