annotate Core/Images/ImageBuffer.cpp @ 3508:70524b4acc72

Name of temporary files now include the process ID to ease design of scripts cleaning /tmp
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 29 Aug 2019 11:41:26 +0200
parents a1cd981a0f9a
children 94f4a18a79cc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1612
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 863
diff changeset
4 * Department, University Hospital of Liege, Belgium
3060
4e43e67f8ecf preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2861
diff changeset
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * In addition, as a special exception, the copyright holders of this
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * program give permission to link the code of its release with the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * the linked executables. You must obey the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * you do not wish to do so, delete this exception statement from your
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * version. If you delete this exception statement from all source files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 * in the program, then also delete it here.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
824
a811bdf8b8eb precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 801
diff changeset
34 #include "../PrecompiledHeaders.h"
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "ImageBuffer.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
37 #include "../OrthancException.h"
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
38
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
39 #include <stdio.h>
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
40 #include <stdlib.h>
860
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 853
diff changeset
41
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 namespace Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 void ImageBuffer::Allocate()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 if (changed_)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
48 Deallocate();
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
49
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
50 /*
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
51 if (forceMinimalPitch_)
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
52 {
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
53 TODO: Align pitch and memory buffer to optimal size for SIMD.
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
54 }
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
55 */
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
56
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 pitch_ = GetBytesPerPixel() * width_;
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
58 size_t size = pitch_ * height_;
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
60 if (size == 0)
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 {
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
62 buffer_ = NULL;
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 {
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
66 buffer_ = malloc(size);
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
67 if (buffer_ == NULL)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
68 {
3348
a1cd981a0f9a more logs
Alain Mazy <alain@mazy.be>
parents: 3060
diff changeset
69 throw OrthancException(ErrorCode_NotEnoughMemory,
a1cd981a0f9a more logs
Alain Mazy <alain@mazy.be>
parents: 3060
diff changeset
70 "Failed to allocate an image buffer of size " + boost::lexical_cast<std::string>(width_) + "x" + boost::lexical_cast<std::string>(height_));
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
71 }
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 changed_ = false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
79 void ImageBuffer::Deallocate()
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
80 {
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
81 if (buffer_ != NULL)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
82 {
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
83 free(buffer_);
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
84 buffer_ = NULL;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
85 changed_ = true;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
86 }
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
87 }
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
88
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
89
1608
adc6a5704cdb OrthancPluginConvertPixelFormat
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
90 ImageBuffer::ImageBuffer(PixelFormat format,
adc6a5704cdb OrthancPluginConvertPixelFormat
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
91 unsigned int width,
2107
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
92 unsigned int height,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
93 bool forceMinimalPitch) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1900
diff changeset
94 forceMinimalPitch_(forceMinimalPitch)
853
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
95 {
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
96 Initialize();
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
97 SetWidth(width);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
98 SetHeight(height);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
99 SetFormat(format);
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
100 }
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
101
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
102
839be3022203 DicomImageInformation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 844
diff changeset
103 void ImageBuffer::Initialize()
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 changed_ = false;
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
106 forceMinimalPitch_ = true;
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 format_ = PixelFormat_Grayscale8;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 width_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 height_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 pitch_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 buffer_ = NULL;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
113
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115 void ImageBuffer::SetFormat(PixelFormat format)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 {
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
117 if (format != format_)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
118 {
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
119 changed_ = true;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
120 format_ = format;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
121 }
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
122 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125 void ImageBuffer::SetWidth(unsigned int width)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 {
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
127 if (width != width_)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
128 {
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
129 changed_ = true;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
130 width_ = width;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
131 }
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
134
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
135 void ImageBuffer::SetHeight(unsigned int height)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 {
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
137 if (height != height_)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
138 {
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
139 changed_ = true;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
140 height_ = height;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
141 }
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
142 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
143
2861
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
144
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
145 void ImageBuffer::GetReadOnlyAccessor(ImageAccessor& accessor)
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147 Allocate();
2861
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
148 accessor.AssignReadOnly(format_, width_, height_, pitch_, buffer_);
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
149 }
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
150
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151
2861
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
152 void ImageBuffer::GetWriteableAccessor(ImageAccessor& accessor)
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 Allocate();
2861
9b4251721f22 ImageAccessor now non-copyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
155 accessor.AssignWritable(format_, width_, height_, pitch_, buffer_);
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 }
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
157
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
158
863
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
159 void ImageBuffer::AcquireOwnership(ImageBuffer& other)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
160 {
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
161 // Remove the content of the current image
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
162 Deallocate();
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
163
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
164 // Force the allocation of the other image (if not already
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
165 // allocated)
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
166 other.Allocate();
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
167
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
168 // Transfer the content of the other image
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
169 changed_ = false;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
170 forceMinimalPitch_ = other.forceMinimalPitch_;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
171 format_ = other.format_;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
172 width_ = other.width_;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
173 height_ = other.height_;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
174 pitch_ = other.pitch_;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
175 buffer_ = other.buffer_;
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
176
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
177 // Force the reinitialization of the other image
3c0d0836f704 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 860
diff changeset
178 other.Initialize();
844
502c49adb5ad jpeg lossless
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 824
diff changeset
179 }
801
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 }