Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestResources.cpp @ 2704:b71c59312bae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix MIME type for PAM images
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 06 Jul 2018 15:18:53 +0200
parents 52217dc47a4e
children 46061a91c88a
comparison
equal deleted inserted replaced
2703:f77c7b48f798 2704:b71c59312bae
364 DicomImageDecoder::ExtractPngImage(answer_, image_, mode_, invert_); 364 DicomImageDecoder::ExtractPngImage(answer_, image_, mode_, invert_);
365 } 365 }
366 366
367 void EncodeUsingPam() 367 void EncodeUsingPam()
368 { 368 {
369 format_ = "image/pam"; 369 /**
370 * "No Internet Media Type (aka MIME type, content type) for
371 * PBM has been registered with IANA, but the unofficial value
372 * image/x-portable-arbitrarymap is assigned by this
373 * specification, to be consistent with conventional values
374 * for the older Netpbm formats."
375 * http://netpbm.sourceforge.net/doc/pam.html
376 **/
377 format_ = "image/x-portable-arbitrarymap";
370 DicomImageDecoder::ExtractPamImage(answer_, image_, mode_, invert_); 378 DicomImageDecoder::ExtractPamImage(answer_, image_, mode_, invert_);
371 } 379 }
372 380
373 void EncodeUsingJpeg(uint8_t quality) 381 void EncodeUsingJpeg(uint8_t quality)
374 { 382 {
547 } 555 }
548 556
549 ImageToEncode image(decoded, mode, invert); 557 ImageToEncode image(decoded, mode, invert);
550 558
551 HttpContentNegociation negociation; 559 HttpContentNegociation negociation;
552 EncodePng png(image); negociation.Register("image/png", png); 560 EncodePng png(image);
553 EncodeJpeg jpeg(image, call); negociation.Register("image/jpeg", jpeg); 561 negociation.Register("image/png", png);
554 EncodePam pam(image); negociation.Register("image/pam", pam); 562
563 EncodeJpeg jpeg(image, call);
564 negociation.Register("image/jpeg", jpeg);
565
566 EncodePam pam(image);
567 negociation.Register("image/x-portable-arbitrarymap", pam);
555 568
556 if (negociation.Apply(call.GetHttpHeaders())) 569 if (negociation.Apply(call.GetHttpHeaders()))
557 { 570 {
558 image.Answer(call.GetOutput()); 571 image.Answer(call.GetOutput());
559 } 572 }