# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1503479463 -7200
# Node ID c0ac0d3501930f65a6ae75675495af4bb823cd7a
# Parent  a3e8ac8b7256cf2a989db36ea5f66dd68aa93719# Parent  18e9a5429cc49f02877f79da1d3779b185027de3
merge

diff -r a3e8ac8b7256 -r c0ac0d350193 Applications/ApplicationToolbox.cpp
--- a/Applications/ApplicationToolbox.cpp	Wed Aug 23 11:10:48 2017 +0200
+++ b/Applications/ApplicationToolbox.cpp	Wed Aug 23 11:11:03 2017 +0200
@@ -163,6 +163,11 @@
       bool ok = false;
       boost::cmatch what;
 
+      // Set white as the default color to avoid compiler warnings
+      red = 255;
+      green = 255;
+      blue = 255;
+
       try
       {
         if (regex_match(color.c_str(), what, pattern))
diff -r a3e8ac8b7256 -r c0ac0d350193 Applications/Dicomizer.cpp
--- a/Applications/Dicomizer.cpp	Wed Aug 23 11:10:48 2017 +0200
+++ b/Applications/Dicomizer.cpp	Wed Aug 23 11:11:03 2017 +0200
@@ -505,7 +505,7 @@
     ("compression", boost::program_options::value<std::string>(), 
      "Compression of the target image (\"none\", \"jpeg\" or \"jpeg2000\")")
     ("jpeg-quality", boost::program_options::value<int>(), "Set quality level for JPEG (0..100)")
-    ("max-size", boost::program_options::value<int>()->default_value(10), "Maximum size per DICOM instance (in MB)")
+    ("max-size", boost::program_options::value<int>()->default_value(10), "Maximum size per DICOM instance (in MB), 0 means no limit on the file size")
     ("folder", boost::program_options::value<std::string>(),
      "Folder where to store the output DICOM instances")
     ("folder-pattern", boost::program_options::value<std::string>()->default_value("wsi-%06d.dcm"),