commit c333154ef31f15c66e748077475220c04fa1e651 Author: Mathieu Malaterre Date: Tue Feb 24 21:49:44 2015 +0100 Do not use `as` since it is a reserved python keyword diff --git a/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h b/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h index 852a684..08309d5 100644 --- a/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h +++ b/Source/MessageExchangeDefinition/gdcmAAssociateRQPDU.h @@ -80,7 +80,7 @@ public: PresentationContextArrayType const &GetPresentationContexts() { return PresContext; } const PresentationContextRQ *GetPresentationContextByID(uint8_t i) const; - const PresentationContextRQ *GetPresentationContextByAbstractSyntax(AbstractSyntax const & as ) const; + const PresentationContextRQ *GetPresentationContextByAbstractSyntax(AbstractSyntax const & absyn ) const; bool IsLastFragment() const { return true; } const UserInformation & GetUserInformation() const { return UserInfo; } diff --git a/Source/MessageExchangeDefinition/gdcmPresentationContextRQ.h b/Source/MessageExchangeDefinition/gdcmPresentationContextRQ.h index db06a9f..6de57dc 100644 --- a/Source/MessageExchangeDefinition/gdcmPresentationContextRQ.h +++ b/Source/MessageExchangeDefinition/gdcmPresentationContextRQ.h @@ -46,7 +46,7 @@ public: const std::ostream &Write(std::ostream &os) const; size_t Size() const; - void SetAbstractSyntax( AbstractSyntax const & as ); + void SetAbstractSyntax( AbstractSyntax const & absyn ); AbstractSyntax const &GetAbstractSyntax() const { return SubItems; } AbstractSyntax &GetAbstractSyntax() { return SubItems; } commit 36e44b330085ae80b4ecc2d519f43db2a65cd61e Author: Mathieu Malaterre Date: Wed Feb 25 07:39:22 2015 +0100 Another round of fixes for bug #345 diff --git a/Source/MessageExchangeDefinition/gdcmPresentationContext.h b/Source/MessageExchangeDefinition/gdcmPresentationContext.h index 324f0fa..c4fba12 100644 --- a/Source/MessageExchangeDefinition/gdcmPresentationContext.h +++ b/Source/MessageExchangeDefinition/gdcmPresentationContext.h @@ -37,7 +37,7 @@ public: PresentationContext( UIDs::TSName asname, UIDs::TSName tsname = UIDs::ImplicitVRLittleEndianDefaultTransferSyntaxforDICOM ); - void SetAbstractSyntax( const char *as ) { AbstractSyntax = as; } + void SetAbstractSyntax( const char *absyn ) { AbstractSyntax = absyn; } const char *GetAbstractSyntax() const { return AbstractSyntax.c_str(); } void AddTransferSyntax( const char *tsstr ); diff --git a/Source/MessageExchangeDefinition/gdcmPresentationContextGenerator.h b/Source/MessageExchangeDefinition/gdcmPresentationContextGenerator.h index 9bb8e43..46b7102 100644 --- a/Source/MessageExchangeDefinition/gdcmPresentationContextGenerator.h +++ b/Source/MessageExchangeDefinition/gdcmPresentationContextGenerator.h @@ -80,7 +80,7 @@ public: /// Not implemented for now. GDCM internally uses Implicit Little Endian void SetDefaultTransferSyntax( const TransferSyntax &ts ); protected: - bool AddPresentationContext( const char *as, const char *ts ); + bool AddPresentationContext( const char *absyn, const char *ts ); const char *GetDefaultTransferSyntax() const; private: