comparison Core/Enumerations.h @ 953:f894be6e7cc1 query-retrieve

merge mainline -> query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 15:34:40 +0200
parents 766a57997121
children 743a75b14bef 2fd5a163776d
comparison
equal deleted inserted replaced
947:c2c28dd17e87 953:f894be6e7cc1
226 { 226 {
227 ImageFormat_Png = 1 227 ImageFormat_Png = 1
228 }; 228 };
229 229
230 230
231 enum Encoding
232 {
233 Encoding_Utf8,
234 Encoding_Latin1
235 };
236
237
231 /** 238 /**
232 * WARNING: Do not change the explicit values in the enumerations 239 * WARNING: Do not change the explicit values in the enumerations
233 * below this point. This would result in incompatible databases 240 * below this point. This would result in incompatible databases
234 * between versions of Orthanc! 241 * between versions of Orthanc!
235 **/ 242 **/