Mercurial > hg > orthanc

annotate OrthancFramework/Sources/Images/Image.cpp @ 4224:38d446c9ee1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 30 Sep 2020 17:59:09 +0200
parents bf7b9edf6b81
children d9473bd5ed43
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
3640
94f4a18a79cc upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3060
diff changeset
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
10 * the License, or (at your option) any later version.
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
15 * Lesser General Public License for more details.
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 *
4119
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
19 * <http://www.gnu.org/licenses/>.
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "Image.h"
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
25 #include "../Compatibility.h"
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "ImageProcessing.h"
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 #include <memory>
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 namespace Orthanc
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 {
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 Image::Image(PixelFormat format,
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 unsigned int width,
2107
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2084
diff changeset
34 unsigned int height,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2084
diff changeset
35 bool forceMinimalPitch) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2084
diff changeset
36 image_(format, width, height, forceMinimalPitch)
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 {
2861
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
38 ImageAccessor accessor;
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
39 image_.GetWriteableAccessor(accessor);
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
40
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 AssignWritable(format, width, height, accessor.GetPitch(), accessor.GetBuffer());
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 }
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 Image* Image::Clone(const ImageAccessor& source)
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 {
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
47 std::unique_ptr<Image> target(new Image(source.GetFormat(), source.GetWidth(), source.GetHeight(), false));
2084
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 ImageProcessing::Copy(*target, source);
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 return target.release();
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 }
20a001ea4aa2 Image::Clone()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 }