Mercurial > hg > orthanc
changeset 821:a7d757d5e93d
back to mainline
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 08 May 2014 17:15:54 +0200 |
parents | 83f0cae7dfcc (current diff) 55bce9b55054 (diff) |
children | 7ce875531950 |
files | |
diffstat | 7 files changed, 24 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Thu May 08 16:44:39 2014 +0200 +++ b/CMakeLists.txt Thu May 08 17:15:54 2014 +0200 @@ -3,7 +3,7 @@ project(Orthanc) # Version of the build, should always be "mainline" except in release branches -set(ORTHANC_VERSION "mainline") +set(ORTHANC_VERSION "0.7.5") #####################################################################
--- a/NEWS Thu May 08 16:44:39 2014 +0200 +++ b/NEWS Thu May 08 17:15:54 2014 +0200 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Version 0.7.5 (2014/05/08) +========================== + * Dynamic negotiation of SOP classes for C-Store SCU * Creation of DICOM instances using the REST API * Embedding of images within DICOM instances
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp Thu May 08 16:44:39 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp Thu May 08 17:15:54 2014 +0200 @@ -1486,12 +1486,12 @@ LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFileVersion() { - return "0.7.0.4"; + return "0.7.0.5"; } LAAW_EXPORT_DLL_API const char* LAAW_CALL_CONVENTION LAAW_EXTERNC_GetFullVersion() { - return "0.7.4"; + return "0.7.5"; } LAAW_EXPORT_DLL_API void LAAW_CALL_CONVENTION LAAW_EXTERNC_FreeString(char* str)
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h Thu May 08 16:44:39 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h Thu May 08 17:15:54 2014 +0200 @@ -507,7 +507,7 @@ * The image is graylevel. Each pixel is signed and stored in two bytes. * **/ - PixelFormat_SignedGrayscale16 = 3, + PixelFormat_SignedGrayscale16 = 4, /** * @brief Color image in RGB24 format. * @@ -516,19 +516,26 @@ **/ PixelFormat_RGB24 = 0, /** + * @brief Color image in RGBA32 format. + * + * Color image in RGBA32 format. + * + **/ + PixelFormat_RGBA32 = 1, + /** * @brief Graylevel 8bpp image. * * The image is graylevel. Each pixel is unsigned and stored in one byte. * **/ - PixelFormat_Grayscale8 = 1, + PixelFormat_Grayscale8 = 2, /** * @brief Graylevel, unsigned 16bpp image. * * The image is graylevel. Each pixel is unsigned and stored in two bytes. * **/ - PixelFormat_Grayscale16 = 2 + PixelFormat_Grayscale16 = 3 }; }
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc Thu May 08 16:44:39 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc Thu May 08 17:15:54 2014 +0200 @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,4 + FILEVERSION 0,7,0,5 PRODUCTVERSION 0,7,0,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL @@ -10,10 +10,10 @@ BEGIN BLOCK "040904E4" BEGIN - VALUE "Comments", "Release 0.7.4" + VALUE "Comments", "Release 0.7.5" VALUE "CompanyName", "CHU of Liege" VALUE "FileDescription", "Native client to the REST API of Orthanc" - VALUE "FileVersion", "0.7.0.4" + VALUE "FileVersion", "0.7.0.5" VALUE "InternalName", "OrthancClient" VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, CHU of Liege" VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
--- a/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc Thu May 08 16:44:39 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc Thu May 08 17:15:54 2014 +0200 @@ -1,7 +1,7 @@ #include <winver.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,7,0,4 + FILEVERSION 0,7,0,5 PRODUCTVERSION 0,7,0,0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_DLL @@ -10,10 +10,10 @@ BEGIN BLOCK "040904E4" BEGIN - VALUE "Comments", "Release 0.7.4" + VALUE "Comments", "Release 0.7.5" VALUE "CompanyName", "CHU of Liege" VALUE "FileDescription", "Native client to the REST API of Orthanc" - VALUE "FileVersion", "0.7.0.4" + VALUE "FileVersion", "0.7.0.5" VALUE "InternalName", "OrthancClient" VALUE "LegalCopyright", "(c) 2012-2014, Sebastien Jodogne, CHU of Liege" VALUE "LegalTrademarks", "Licensing information is available on https://code.google.com/p/orthanc/"
--- a/OrthancCppClient/SharedLibrary/Product.json Thu May 08 16:44:39 2014 +0200 +++ b/OrthancCppClient/SharedLibrary/Product.json Thu May 08 17:15:54 2014 +0200 @@ -4,5 +4,5 @@ "Company" : "CHU of Liege", "Copyright" : "(c) 2012-2014, Sebastien Jodogne, CHU of Liege", "Legal" : "Licensing information is available on https://code.google.com/p/orthanc/", - "Version" : "0.7.4" + "Version" : "0.7.5" }