Mercurial > hg > orthanc-java

comparison Resources/OrthancCPlugin-1.10.0.patch @ 0:3ecef5782f2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
initial commit
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 18 Oct 2023 17:59:44 +0200
parents
children 7f821a89e000
comparison
equal deleted inserted replaced
-1:000000000000 0:3ecef5782f2c
1 --- OrthancCPlugin.h.orig 2023-10-14 17:06:44.406226125 +0200
2 +++ OrthancCPlugin.h 2023-10-14 17:09:26.978745058 +0200
3 @@ -837,7 +837,7 @@
4 **/
5 typedef enum
6 {
7 - OrthancPluginDicomToJsonFlags_None = 0,
8 + OrthancPluginDicomToJsonFlags_None = 0, /*!< Default formatting */
9 OrthancPluginDicomToJsonFlags_IncludeBinary = (1 << 0), /*!< Include the binary tags */
10 OrthancPluginDicomToJsonFlags_IncludePrivateTags = (1 << 1), /*!< Include the private tags */
11 OrthancPluginDicomToJsonFlags_IncludeUnknownTags = (1 << 2), /*!< Include the tags unknown by the dictionary */
12 @@ -858,7 +858,7 @@
13 **/
14 typedef enum
15 {
16 - OrthancPluginCreateDicomFlags_None = 0,
17 + OrthancPluginCreateDicomFlags_None = 0, /*!< Default mode */
18 OrthancPluginCreateDicomFlags_DecodeDataUriScheme = (1 << 0), /*!< Decode fields encoded using data URI scheme */
19 OrthancPluginCreateDicomFlags_GenerateIdentifiers = (1 << 1), /*!< Automatically generate DICOM identifiers */
20
21 @@ -975,32 +975,46 @@
22 **/
23 typedef enum
24 {
25 + /**
26 + * Success: The DICOM instance is properly stored in the SCP
27 + **/
28 OrthancPluginStorageCommitmentFailureReason_Success = 0,
29 - /*!< Success: The DICOM instance is properly stored in the SCP */
30
31 + /**
32 + * 0110H: A general failure in processing the operation was encountered
33 + **/
34 OrthancPluginStorageCommitmentFailureReason_ProcessingFailure = 1,
35 - /*!< 0110H: A general failure in processing the operation was encountered */
36
37 + /**
38 + * 0112H: One or more of the elements in the Referenced SOP
39 + * Instance Sequence was not available
40 + **/
41 OrthancPluginStorageCommitmentFailureReason_NoSuchObjectInstance = 2,
42 - /*!< 0112H: One or more of the elements in the Referenced SOP
43 - Instance Sequence was not available */
44
45 + /**
46 + * 0213H: The SCP does not currently have enough resources to
47 + * store the requested SOP Instance(s)
48 + **/
49 OrthancPluginStorageCommitmentFailureReason_ResourceLimitation = 3,
50 - /*!< 0213H: The SCP does not currently have enough resources to
51 - store the requested SOP Instance(s) */
52
53 + /**
54 + * 0122H: Storage Commitment has been requested for a SOP Instance
55 + * with a SOP Class that is not supported by the SCP
56 + **/
57 OrthancPluginStorageCommitmentFailureReason_ReferencedSOPClassNotSupported = 4,
58 - /*!< 0122H: Storage Commitment has been requested for a SOP
59 - Instance with a SOP Class that is not supported by the SCP */
60
61 + /**
62 + * 0119H: The SOP Class of an element in the Referenced SOP
63 + * Instance Sequence did not correspond to the SOP class
64 + * registered for this SOP Instance at the SCP
65 + **/
66 OrthancPluginStorageCommitmentFailureReason_ClassInstanceConflict = 5,
67 - /*!< 0119H: The SOP Class of an element in the Referenced SOP
68 - Instance Sequence did not correspond to the SOP class registered
69 - for this SOP Instance at the SCP */
70
71 + /**
72 + * 0131H: The Transaction UID of the Storage Commitment Request is
73 + * already in use
74 + **/
75 OrthancPluginStorageCommitmentFailureReason_DuplicateTransactionUID = 6
76 - /*!< 0131H: The Transaction UID of the Storage Commitment Request
77 - is already in use */
78 } OrthancPluginStorageCommitmentFailureReason;
79
80
81 @@ -1829,15 +1843,16 @@
82 * @see OrthancPluginCheckVersion
83 * @ingroup Callbacks
84 **/
85 - ORTHANC_PLUGIN_INLINE int OrthancPluginCheckVersionAdvanced(
86 + ORTHANC_PLUGIN_INLINE int32_t OrthancPluginCheckVersionAdvanced(
87 OrthancPluginContext* context,
88 - int expectedMajor,
89 - int expectedMinor,
90 - int expectedRevision)
91 + int32_t expectedMajor,
92 + int32_t expectedMinor,
93 + int32_t expectedRevision)
94 {
95 - int major, minor, revision;
96 + int32_t major, minor, revision;
97
98 - if (sizeof(int32_t) != sizeof(OrthancPluginErrorCode) ||
99 + if (sizeof(int) != sizeof(int32_t) || /* Ensure binary compatibility with Orthanc SDK <= 1.12.1 */
100 + sizeof(int32_t) != sizeof(OrthancPluginErrorCode) ||
101 sizeof(int32_t) != sizeof(OrthancPluginHttpMethod) ||
102 sizeof(int32_t) != sizeof(_OrthancPluginService) ||
103 sizeof(int32_t) != sizeof(_OrthancPluginProperty) ||
104 @@ -1935,7 +1950,7 @@
105 * @see OrthancPluginCheckVersionAdvanced
106 * @ingroup Callbacks
107 **/
108 - ORTHANC_PLUGIN_INLINE int OrthancPluginCheckVersion(
109 + ORTHANC_PLUGIN_INLINE int32_t OrthancPluginCheckVersion(
110 OrthancPluginContext* context)
111 {
112 return OrthancPluginCheckVersionAdvanced(
113 @@ -3077,7 +3092,7 @@
114 * @return 1 if the metadata is present, 0 if it is absent, -1 in case of error.
115 * @ingroup DicomInstance
116 **/
117 - ORTHANC_PLUGIN_INLINE int OrthancPluginHasInstanceMetadata(
118 + ORTHANC_PLUGIN_INLINE int32_t OrthancPluginHasInstanceMetadata(
119 OrthancPluginContext* context,
120 const OrthancPluginDicomInstance* instance,
121 const char* metadata)
122 @@ -3856,13 +3871,13 @@
123 OrthancPluginContext* context,
124 OrthancPluginRestOutput* output,
125 uint16_t status,
126 - const char* body,
127 + const void* body,
128 uint32_t bodySize)
129 {
130 _OrthancPluginSendHttpStatus params;
131 params.output = output;
132 params.status = status;
133 - params.body = body;
134 + params.body = reinterpret_cast<const char*>(body);
135 params.bodySize = bodySize;
136 context->InvokeService(context, _OrthancPluginService_SendHttpStatus, &params);
137 }
138 @@ -6760,7 +6775,7 @@
139 {
140 char** resultId;
141 OrthancPluginJob *job;
142 - int priority;
143 + int32_t priority;
144 } _OrthancPluginSubmitJob;
145
146 /**
147 @@ -6779,7 +6794,7 @@
148 ORTHANC_PLUGIN_INLINE char *OrthancPluginSubmitJob(
149 OrthancPluginContext *context,
150 OrthancPluginJob *job,
151 - int priority)
152 + int32_t priority)
153 {
154 char* resultId = NULL;
155