Mercurial > hg > orthanc

comparison OrthancServer/ParsedDicomFile.cpp @ 1018:564e39d6df13 lua-scripting

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->lua-scripting
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 10 Jul 2014 11:31:14 +0200
parents a226e0959d8b f009f7c75069
children e494ceb8d763
comparison
equal deleted inserted replaced
1017:9d0c7301596e 1018:564e39d6df13
280 280
281 OFCondition cond = element.getPartialValue(&buffer[0], offset, nbytes); 281 OFCondition cond = element.getPartialValue(&buffer[0], offset, nbytes);
282 282
283 if (cond.good()) 283 if (cond.good())
284 { 284 {
285 output.GetLowLevelOutput().Send(&buffer[0], nbytes); 285 output.GetLowLevelOutput().SendBodyData(&buffer[0], nbytes);
286 offset += nbytes; 286 offset += nbytes;
287 } 287 }
288 else 288 else
289 { 289 {
290 LOG(ERROR) << "Error while sending a DICOM field: " << cond.text(); 290 LOG(ERROR) << "Error while sending a DICOM field: " << cond.text();
1170 bool ok = false; 1170 bool ok = false;
1171 1171
1172 switch (mode) 1172 switch (mode)
1173 { 1173 {
1174 case ImageExtractionMode_UInt8: 1174 case ImageExtractionMode_UInt8:
1175 ok = DicomImageDecoder::DecodeAndTruncate(result, dataset, frame, PixelFormat_Grayscale8); 1175 ok = DicomImageDecoder::DecodeAndTruncate(result, dataset, frame, PixelFormat_Grayscale8, false);
1176 break; 1176 break;
1177 1177
1178 case ImageExtractionMode_UInt16: 1178 case ImageExtractionMode_UInt16:
1179 ok = DicomImageDecoder::DecodeAndTruncate(result, dataset, frame, PixelFormat_Grayscale16); 1179 ok = DicomImageDecoder::DecodeAndTruncate(result, dataset, frame, PixelFormat_Grayscale16, false);
1180 break; 1180 break;
1181 1181
1182 case ImageExtractionMode_Int16: 1182 case ImageExtractionMode_Int16:
1183 ok = DicomImageDecoder::DecodeAndTruncate(result, dataset, frame, PixelFormat_SignedGrayscale16); 1183 ok = DicomImageDecoder::DecodeAndTruncate(result, dataset, frame, PixelFormat_SignedGrayscale16, false);
1184 break; 1184 break;
1185 1185
1186 case ImageExtractionMode_Preview: 1186 case ImageExtractionMode_Preview:
1187 ok = DicomImageDecoder::DecodePreview(result, dataset, frame); 1187 ok = DicomImageDecoder::DecodePreview(result, dataset, frame);
1188 break; 1188 break;