1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
--- imagepool/poolmoveassociation.cpp.orig 2014-01-19 07:38:17 UTC
+++ imagepool/poolmoveassociation.cpp
@@ -68,7 +68,7 @@ void MoveAssociation::Create(const std::
Association::Create(title, peer, port, ouraet, abstractSyntax);
}
-CONDITION MoveAssociation::SendObject(DcmDataset *dataset) {
+OFCondition MoveAssociation::SendObject(DcmDataset *dataset) {
return moveSCU(dataset);
}
@@ -79,8 +79,8 @@ void MoveAssociation::OnAddPresentationC
ASC_addPresentationContext(params, 5, m_abstractSyntax, mpeg_transfer, DIM_OF(mpeg_transfer));
}
-CONDITION MoveAssociation::moveSCU(DcmDataset *pdset) {
- CONDITION cond;
+OFCondition MoveAssociation::moveSCU(DcmDataset *pdset) {
+ OFCondition cond;
T_ASC_PresentationContextID presId;
T_DIMSE_C_MoveRQ req;
T_DIMSE_C_MoveRSP rsp;
@@ -161,8 +161,8 @@ void MoveAssociation::subOpCallback(void
}
}
-CONDITION MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
- CONDITION cond = ASC_NORMAL;
+OFCondition MoveAssociation::acceptSubAssoc(T_ASC_Network *aNet, T_ASC_Association **assoc) {
+ OFCondition cond = EC_Normal;
const char* knownAbstractSyntaxes[] = { UID_VerificationSOPClass };
const char* transferSyntaxes[] = { UID_JPEGProcess14SV1TransferSyntax, NULL, NULL, UID_LittleEndianImplicitTransferSyntax, UID_MPEG2MainProfileAtMainLevelTransferSyntax };
@@ -222,7 +222,7 @@ CONDITION MoveAssociation::acceptSubAsso
}
-CONDITION MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
+OFCondition MoveAssociation::subOpSCP(T_ASC_Association **subAssoc) {
T_DIMSE_Message msg;
T_ASC_PresentationContextID presID;
@@ -269,8 +269,8 @@ CONDITION MoveAssociation::subOpSCP(T_AS
return cond;
}
-CONDITION MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
- CONDITION cond;
+OFCondition MoveAssociation::storeSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
+ OFCondition cond;
T_DIMSE_C_StoreRQ* req;
DcmDataset *dset = new DcmDataset;
@@ -328,8 +328,8 @@ void MoveAssociation::storeSCPCallback(v
}
-CONDITION MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
- CONDITION cond;
+OFCondition MoveAssociation::echoSCP(T_ASC_Association *assoc, T_DIMSE_Message *msg, T_ASC_PresentationContextID presID) {
+ OFCondition cond;
// the echo succeeded !!
cond = DIMSE_sendEchoResponse(assoc, presID, &msg->msg.CEchoRQ, STATUS_Success, NULL);
|
