annotate Orthanc/Core/Toolbox.h @ 134:d73006baca3f

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 13 Jun 2016 10:27:52 +0200
parents 2c73a785c08e
children 9362080e5e3d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78
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
122
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 90
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
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 #pragma once
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "Enumerations.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 #include <stdint.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 #include <vector>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include <string>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 #include <json/json.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41
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 typedef std::vector<std::string> UriComponents;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 class NullType
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
134
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
50 enum ServerBarrierEvent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
51 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
52 ServerBarrierEvent_Stop,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
53 ServerBarrierEvent_Reload // SIGHUP signal: reload configuration file
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
54 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
55
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 namespace Toolbox
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 {
134
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
58 ServerBarrierEvent ServerBarrier(const bool& stopFlag);
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
134
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 129
diff changeset
60 ServerBarrierEvent ServerBarrier();
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 void ToUpperCase(std::string& s); // Inplace version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 void ToLowerCase(std::string& s); // Inplace version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 void ToUpperCase(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 const std::string& source);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 void ToLowerCase(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 const std::string& source);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 void ReadFile(std::string& content,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74
128
e8cfda4c8a2f Sync + support of JPEG2000 lossless images with YBR_RCT photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
75 bool ReadHeader(std::string& header,
e8cfda4c8a2f Sync + support of JPEG2000 lossless images with YBR_RCT photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
76 const std::string& path,
e8cfda4c8a2f Sync + support of JPEG2000 lossless images with YBR_RCT photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
77 size_t headerSize);
e8cfda4c8a2f Sync + support of JPEG2000 lossless images with YBR_RCT photometric interpretation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 125
diff changeset
78
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 void WriteFile(const std::string& content,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 void WriteFile(const void* content,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 size_t size,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86 void USleep(uint64_t microSeconds);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 void RemoveFile(const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 void SplitUriComponents(UriComponents& components,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 const std::string& uri);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
93 void TruncateUri(UriComponents& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
94 const UriComponents& source,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
95 size_t fromLevel);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
96
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
97 bool IsChildUri(const UriComponents& baseUri,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 const UriComponents& testedUri);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100 std::string AutodetectMimeType(const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 std::string FlattenUri(const UriComponents& components,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 size_t fromLevel = 0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 uint64_t GetFileSize(const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 #if !defined(ORTHANC_ENABLE_MD5) || ORTHANC_ENABLE_MD5 == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 void ComputeMD5(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 const std::string& data);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 void ComputeMD5(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
112 const void* data,
90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
113 size_t size);
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
114 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
115
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
116 void ComputeSHA1(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
117 const std::string& data);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118
90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
119 void ComputeSHA1(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
120 const void* data,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
121 size_t size);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
122
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
123 bool IsSHA1(const char* str,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
124 size_t size);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
125
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
126 bool IsSHA1(const std::string& s);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
127
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
128 #if !defined(ORTHANC_ENABLE_BASE64) || ORTHANC_ENABLE_BASE64 == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
129 void DecodeBase64(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
130 const std::string& data);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
131
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
132 void EncodeBase64(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 const std::string& data);
79
abdde1dfb3eb use sdk 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
134
abdde1dfb3eb use sdk 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
135 # if BOOST_HAS_REGEX == 1
129
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 128
diff changeset
136 bool DecodeDataUriScheme(std::string& mime,
79
abdde1dfb3eb use sdk 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
137 std::string& content,
abdde1dfb3eb use sdk 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
138 const std::string& source);
abdde1dfb3eb use sdk 0.9.4
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
139 # endif
90
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
141 void EncodeDataUriScheme(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
142 const std::string& mime,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
143 const std::string& content);
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
144 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
145
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
146 std::string GetPathToExecutable();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
147
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
148 std::string GetDirectoryOfExecutable();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
149
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
150 std::string ConvertToUtf8(const std::string& source,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
151 Encoding sourceEncoding);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
152
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
153 std::string ConvertFromUtf8(const std::string& source,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
154 Encoding targetEncoding);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
155
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
156 std::string ConvertToAscii(const std::string& source);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
157
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
158 std::string StripSpaces(const std::string& source);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
159
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
160 #if BOOST_HAS_DATE_TIME == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
161 std::string GetNowIsoString();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
162
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
163 void GetNowDicom(std::string& date,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
164 std::string& time);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
165 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
167 // In-place percent-decoding for URL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
168 void UrlDecode(std::string& s);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
169
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170 Endianness DetectEndianness();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
171
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
172 #if BOOST_HAS_REGEX == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
173 std::string WildcardToRegularExpression(const std::string& s);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
175
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
176 void TokenizeString(std::vector<std::string>& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177 const std::string& source,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178 char separator);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
179
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
180 void MakeDirectory(const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
181
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
182 bool IsExistingFile(const std::string& path);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
183
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184 #if ORTHANC_PUGIXML_ENABLED == 1
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
185 void JsonToXml(std::string& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
186 const Json::Value& source,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
187 const std::string& rootElement = "root",
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
188 const std::string& arrayElement = "item");
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
189 #endif
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
190
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
191 void ExecuteSystemCommand(const std::string& command,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
192 const std::vector<std::string>& arguments);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
194 bool IsInteger(const std::string& str);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 void CopyJsonWithoutComments(Json::Value& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
197 const Json::Value& source);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
199 bool StartsWith(const std::string& str,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 const std::string& prefix);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
201
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202 int GetProcessId();
125
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
203
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 122
diff changeset
204 bool IsRegularFile(const std::string& path);
78
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
205 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
206 }