# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1770988708 -3600
# Node ID fce05c8b00fb8cbf962b3db8c3d5e4bf789263ef
# Parent  9a7eedece65fbf34f3fc3abf70c4abc8658e1a84
WADO RS: return raw PDF

diff -r 9a7eedece65f -r fce05c8b00fb CMakeLists.txt
--- a/CMakeLists.txt	Fri Feb 13 10:05:12 2026 +0100
+++ b/CMakeLists.txt	Fri Feb 13 14:18:28 2026 +0100
@@ -166,6 +166,7 @@
   ${ADDITIONAL_RESOURCES}
   JAVASCRIPT_LIBS   ${JAVASCRIPT_LIBS_DIR}
   VIDEO_THUMBNAIL   ${CMAKE_SOURCE_DIR}/Resources/Images/video-thumbnail.jpg
+  PDF_THUMBNAIL     ${CMAKE_SOURCE_DIR}/Resources/Images/pdf-thumbnail.jpg
   )
 
 
diff -r 9a7eedece65f -r fce05c8b00fb NEWS
--- a/NEWS	Fri Feb 13 10:05:12 2026 +0100
+++ b/NEWS	Fri Feb 13 14:18:28 2026 +0100
@@ -1,3 +1,10 @@
+Pending changes in the mainline
+===============================
+
+* If calling /rendered route on a Encapsulated PDF, the plugin will now return the pdf file
+  instead of generating a 400 error.
+
+
 Version 1.22 (2025-12-02)
 =========================
 
diff -r 9a7eedece65f -r fce05c8b00fb Plugin/WadoRsRetrieveRendered.cpp
--- a/Plugin/WadoRsRetrieveRendered.cpp	Fri Feb 13 10:05:12 2026 +0100
+++ b/Plugin/WadoRsRetrieveRendered.cpp	Fri Feb 13 14:18:28 2026 +0100
@@ -821,6 +821,32 @@
   return false;
 }
 
+static void AnswerRawData(OrthancPluginRestOutput* output,
+                          bool isThumbnail,
+                          Orthanc::EmbeddedResources::FileResourceId thumbnailResourceId,
+                          const char* thumbnailMimeType,
+                          const std::string& rawDataUrl)
+{
+  if (isThumbnail)
+  {
+    // we are not able to extract a thumbnail from a video/pdf -> just return an icon
+    std::string thumbnail;
+    Orthanc::EmbeddedResources::GetFileResource(thumbnail, thumbnailResourceId);
+    OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, thumbnail.c_str(), thumbnail.size(), thumbnailMimeType);
+    return;
+  }
+  else
+  {
+    OrthancPlugins::RestApiClient apiClient;
+    apiClient.SetPath(rawDataUrl);
+    if (apiClient.Execute())
+    {
+      apiClient.ExecuteAndForwardAnswer(OrthancPlugins::GetGlobalContext(), output);
+      return;
+    }
+  }
+}
+
 
 static void AnswerFrameRendered(OrthancPluginRestOutput* output,
                                 const std::string& instanceId,
@@ -835,24 +861,8 @@
   {
     if (currentSyntax >= Orthanc::DicomTransferSyntax_MPEG2MainProfileAtMainLevel && currentSyntax <= Orthanc::DicomTransferSyntax_HEVCMain10ProfileLevel5_1)
     {
-      if (isThumbnail)
-      {
-        // we are not able to extract a thumbnail from a video -> just return a camera icon
-        std::string videoThumbnail;
-        Orthanc::EmbeddedResources::GetFileResource(videoThumbnail, Orthanc::EmbeddedResources::VIDEO_THUMBNAIL);
-        OrthancPluginAnswerBuffer(OrthancPlugins::GetGlobalContext(), output, videoThumbnail.c_str(), videoThumbnail.size(), "image/jpeg");
-        return;
-      }
-      else
-      {
-        OrthancPlugins::RestApiClient apiClient;
-        apiClient.SetPath(std::string("/instances/") + instanceId + "/frames/0/raw");
-        if (apiClient.Execute())
-        {
-          apiClient.ExecuteAndForwardAnswer(OrthancPlugins::GetGlobalContext(), output);
-          return;
-        }
-      }
+      AnswerRawData(output, isThumbnail, Orthanc::EmbeddedResources::VIDEO_THUMBNAIL, "image/jpeg", std::string("/instances/") + instanceId + "/frames/0/raw");
+      return;
     }
   }
 
@@ -862,6 +872,7 @@
   static const char* const PER_FRAME_FUNCTIONAL_GROUPS_SEQUENCE = "5200,9230";
   static const char* const PIXEL_VALUE_TRANSFORMATION_SEQUENCE = "0028,9145";
   static const char* const FRAME_VOI_LUT_SEQUENCE = "0028,9132";
+  static const char* const SOP_CLASS_UID = "0008,0016";
 
   Orthanc::MimeType mime = Orthanc::MimeType_Jpeg;  // This is the default in DICOMweb
       
@@ -906,6 +917,16 @@
     Json::Value tags;
     buffer.DicomToJson(tags, OrthancPluginDicomToJsonFormat_Short, OrthancPluginDicomToJsonFlags_None, 255);
 
+    if (tags.isMember(SOP_CLASS_UID))
+    {
+      std::string sopClassUid = tags[SOP_CLASS_UID].asString();
+      if (sopClassUid == "1.2.840.10008.5.1.4.1.1.104.1")  // if the instance is a PDF
+      {
+        AnswerRawData(output, isThumbnail, Orthanc::EmbeddedResources::PDF_THUMBNAIL, "image/jpeg", std::string("/instances/") + instanceId + "/pdf");
+        return;
+      }
+    }
+
     const unsigned int f = static_cast<unsigned int>(frame - 1);
     
     if (ReadRescale(parameters, tags))
diff -r 9a7eedece65f -r fce05c8b00fb Resources/Images/pdf-thumbnail.jpg
Binary file Resources/Images/pdf-thumbnail.jpg has changed