Mercurial > hg > orthanc

changeset 5252:742448a9b600

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow compilation of DICOM networking without support for transcoding
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 08 Apr 2023 11:38:01 +0200
parents b2de3a2ad3b9
children 1700fe5c9737 0b183bb77c83
files OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp	Fri Apr 07 12:20:27 2023 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.cpp	Sat Apr 08 11:38:01 2023 +0200
@@ -472,6 +472,7 @@
   }
 
 
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
   void DicomStoreUserConnection::LookupTranscoding(std::set<DicomTransferSyntax>& acceptedSyntaxes,
                                                    const std::string& sopClassUid,
                                                    DicomTransferSyntax sourceSyntax,
@@ -496,8 +497,10 @@
       }
     }
   }
+#endif
+  
 
-
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
   void DicomStoreUserConnection::Transcode(std::string& sopClassUid /* out */,
                                            std::string& sopInstanceUid /* out */,
                                            IDicomTranscoder& transcoder,
@@ -632,8 +635,10 @@
       }
     }
   }
-
+#endif
   
+  
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
   void DicomStoreUserConnection::Transcode(std::string& sopClassUid /* out */,
                                            std::string& sopInstanceUid /* out */,
                                            IDicomTranscoder& transcoder,
@@ -646,4 +651,5 @@
     Transcode(sopClassUid, sopInstanceUid, transcoder, buffer, size, DicomTransferSyntax_LittleEndianExplicit,
               hasMoveOriginator, moveOriginatorAET, moveOriginatorID);
   }
+#endif
 }
--- a/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h	Fri Apr 07 12:20:27 2023 +0200
+++ b/OrthancFramework/Sources/DicomNetworking/DicomStoreUserConnection.h	Sat Apr 08 11:38:01 2023 +0200
@@ -96,11 +96,13 @@
                                       bool hasPreferred,
                                       DicomTransferSyntax preferred);
 
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
     void LookupTranscoding(std::set<DicomTransferSyntax>& acceptedSyntaxes,
                            const std::string& sopClassUid,
                            DicomTransferSyntax sourceSyntax,
                            bool hasPreferred,
                            DicomTransferSyntax preferred);
+#endif
 
   public:
     explicit DicomStoreUserConnection(const DicomAssociationParameters& params);
@@ -142,6 +144,7 @@
                           DicomTransferSyntax& transferSyntax,
                           DcmFileFormat& dicom);
 
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
     void Transcode(std::string& sopClassUid /* out */,
                    std::string& sopInstanceUid /* out */,
                    IDicomTranscoder& transcoder,
@@ -151,7 +154,9 @@
                    bool hasMoveOriginator,
                    const std::string& moveOriginatorAET,
                    uint16_t moveOriginatorID);
-
+#endif
+    
+#if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
     void Transcode(std::string& sopClassUid /* out */,
                    std::string& sopInstanceUid /* out */,
                    IDicomTranscoder& transcoder,
@@ -160,5 +165,6 @@
                    bool hasMoveOriginator,
                    const std::string& moveOriginatorAET,
                    uint16_t moveOriginatorID);
+#endif
   };
 }