Mercurial > hg > orthanc
changeset 2084:20a001ea4aa2
Image::Clone()
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 09 Sep 2016 12:09:04 +0200 |
parents | bfeacb51af20 |
children | 5d4743fd8a85 |
files | CMakeLists.txt Core/Images/Image.cpp Core/Images/Image.h |
diffstat | 3 files changed, 61 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu Sep 08 16:32:13 2016 +0200 +++ b/CMakeLists.txt Fri Sep 09 12:09:04 2016 +0200 @@ -131,6 +131,7 @@ Core/Images/Font.cpp Core/Images/FontRegistry.cpp Core/Images/IImageWriter.cpp + Core/Images/Image.cpp Core/Images/ImageAccessor.cpp Core/Images/ImageBuffer.cpp Core/Images/ImageProcessing.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Core/Images/Image.cpp Fri Sep 09 12:09:04 2016 +0200 @@ -0,0 +1,57 @@ +/** + * Orthanc - A Lightweight, RESTful DICOM Store + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital 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 <http://www.gnu.org/licenses/>. + **/ + + +#include "Image.h" + +#include "ImageProcessing.h" + +#include <memory> + +namespace Orthanc +{ + Image::Image(PixelFormat format, + unsigned int width, + unsigned int height) : + image_(format, width, height) + { + ImageAccessor accessor = image_.GetAccessor(); + AssignWritable(format, width, height, accessor.GetPitch(), accessor.GetBuffer()); + } + + + Image* Image::Clone(const ImageAccessor& source) + { + std::auto_ptr<Image> target(new Image(source.GetFormat(), source.GetWidth(), source.GetHeight())); + ImageProcessing::Copy(*target, source); + return target.release(); + } +}
--- a/Core/Images/Image.h Thu Sep 08 16:32:13 2016 +0200 +++ b/Core/Images/Image.h Fri Sep 09 12:09:04 2016 +0200 @@ -45,11 +45,8 @@ public: Image(PixelFormat format, unsigned int width, - unsigned int height) : - image_(format, width, height) - { - ImageAccessor accessor = image_.GetAccessor(); - AssignWritable(format, width, height, accessor.GetPitch(), accessor.GetBuffer()); - } + unsigned int height); + + static Image* Clone(const ImageAccessor& source); }; }