Mercurial > hg > orthanc
comparison Core/Enumerations.h @ 955:743a75b14bef plugins
merge mainline -> plugins
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 25 Jun 2014 15:37:48 +0200 |
parents | 0570a8c859cb 766a57997121 |
children | 509e146c3cb3 |
comparison
equal
deleted
inserted
replaced
944:c068671d12a9 | 955:743a75b14bef |
---|---|
227 { | 227 { |
228 ImageFormat_Png = 1 | 228 ImageFormat_Png = 1 |
229 }; | 229 }; |
230 | 230 |
231 | 231 |
232 enum Encoding | |
233 { | |
234 Encoding_Utf8, | |
235 Encoding_Latin1 | |
236 }; | |
237 | |
238 | |
232 /** | 239 /** |
233 * WARNING: Do not change the explicit values in the enumerations | 240 * WARNING: Do not change the explicit values in the enumerations |
234 * below this point. This would result in incompatible databases | 241 * below this point. This would result in incompatible databases |
235 * between versions of Orthanc! | 242 * between versions of Orthanc! |
236 **/ | 243 **/ |