# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1399562154 -7200
# Node ID a7d757d5e93d2e1b72a2a12cf2a9ffcff952e6f0
# Parent  83f0cae7dfcc5547e0e81a1c13e9bb1d6247cd5d# Parent  55bce9b55054a8c80fb6ec01bf405f7ba613e836
back to mainline

diff -r 83f0cae7dfcc -r a7d757d5e93d CMakeLists.txt
--- 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")
 
 
 #####################################################################
diff -r 83f0cae7dfcc -r a7d757d5e93d NEWS
--- 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
diff -r 83f0cae7dfcc -r a7d757d5e93d OrthancCppClient/SharedLibrary/AUTOGENERATED/ExternC.cpp
--- 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)
diff -r 83f0cae7dfcc -r a7d757d5e93d OrthancCppClient/SharedLibrary/AUTOGENERATED/OrthancCppClient.h
--- 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
   };
 }
 
diff -r 83f0cae7dfcc -r a7d757d5e93d OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows32.rc
--- 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/"
diff -r 83f0cae7dfcc -r a7d757d5e93d OrthancCppClient/SharedLibrary/AUTOGENERATED/Windows64.rc
--- 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/"
diff -r 83f0cae7dfcc -r a7d757d5e93d OrthancCppClient/SharedLibrary/Product.json
--- 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"
 }