# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1427722099 -7200
# Node ID 7f0aa3c0f659b1e0c531bfc7284ad7766a202bb7
# Parent  732b6a4ed541a96d528da6bab73f14f9384a12d8
code improvements

diff -r 732b6a4ed541 -r 7f0aa3c0f659 Core/Compression/HierarchicalZipWriter.cpp
--- a/Core/Compression/HierarchicalZipWriter.cpp	Mon Mar 30 15:12:21 2015 +0200
+++ b/Core/Compression/HierarchicalZipWriter.cpp	Mon Mar 30 15:28:19 2015 +0200
@@ -53,7 +53,7 @@
       if (c == '^')
         c = ' ';
 
-      if (c < 128 && 
+      if (c <= 127 && 
           c >= 0)
       {
         if (isspace(c)) 
diff -r 732b6a4ed541 -r 7f0aa3c0f659 Core/ImageFormats/ImageProcessing.cpp
--- a/Core/ImageFormats/ImageProcessing.cpp	Mon Mar 30 15:12:21 2015 +0200
+++ b/Core/ImageFormats/ImageProcessing.cpp	Mon Mar 30 15:28:19 2015 +0200
@@ -209,7 +209,7 @@
   void MultiplyConstantInternal(ImageAccessor& image,
                                 float factor)
   {
-    if (abs(factor - 1.0f) <= std::numeric_limits<float>::epsilon())
+    if (std::abs(factor - 1.0f) <= std::numeric_limits<float>::epsilon())
     {
       return;
     }
diff -r 732b6a4ed541 -r 7f0aa3c0f659 Core/MultiThreading/ThreadedCommandProcessor.cpp
--- a/Core/MultiThreading/ThreadedCommandProcessor.cpp	Mon Mar 30 15:12:21 2015 +0200
+++ b/Core/MultiThreading/ThreadedCommandProcessor.cpp	Mon Mar 30 15:28:19 2015 +0200
@@ -175,7 +175,7 @@
   {
     boost::mutex::scoped_lock lock(mutex_);
 
-    while (!remainingCommands_ == 0)
+    while (remainingCommands_ != 0)
     {
       processedCommand_.wait(lock);
     }
diff -r 732b6a4ed541 -r 7f0aa3c0f659 Core/Toolbox.cpp
--- a/Core/Toolbox.cpp	Mon Mar 30 15:12:21 2015 +0200
+++ b/Core/Toolbox.cpp	Mon Mar 30 15:28:19 2015 +0200
@@ -633,7 +633,7 @@
     result.reserve(source.size() + 1);
     for (size_t i = 0; i < source.size(); i++)
     {
-      if (source[i] < 128 && source[i] >= 0 && !iscntrl(source[i]))
+      if (source[i] <= 127 && source[i] >= 0 && !iscntrl(source[i]))
       {
         result.push_back(source[i]);
       }
diff -r 732b6a4ed541 -r 7f0aa3c0f659 Resources/CMake/DcmtkConfiguration.cmake
--- a/Resources/CMake/DcmtkConfiguration.cmake	Mon Mar 30 15:12:21 2015 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Mon Mar 30 15:28:19 2015 +0200
@@ -3,6 +3,7 @@
   find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic
     /usr/share/dcmtk
     /usr/share/libdcmtk2
+    /usr/local/share/dcmtk
     )
 
   message("Autodetected path to the DICOM dictionaries: ${DCMTK_DICTIONARY_DIR_AUTO}")
diff -r 732b6a4ed541 -r 7f0aa3c0f659 Resources/CMake/SQLiteConfiguration.cmake
--- a/Resources/CMake/SQLiteConfiguration.cmake	Mon Mar 30 15:12:21 2015 +0200
+++ b/Resources/CMake/SQLiteConfiguration.cmake	Mon Mar 30 15:28:19 2015 +0200
@@ -28,8 +28,11 @@
     message(FATAL_ERROR "Please install the libsqlite3-dev package")
   endif()
 
+  find_path(SQLITE_INCLUDE_DIR sqlite3.h)
+  message("SQLite include dir: ${SQLITE_INCLUDE_DIR}")
+
   # Autodetection of the version of SQLite
-  file(STRINGS "/usr/include/sqlite3.h" SQLITE_VERSION_NUMBER1 REGEX "#define SQLITE_VERSION_NUMBER.*$")    
+  file(STRINGS "${SQLITE_INCLUDE_DIR}/sqlite3.h" SQLITE_VERSION_NUMBER1 REGEX "#define SQLITE_VERSION_NUMBER.*$")    
   string(REGEX REPLACE "#define SQLITE_VERSION_NUMBER(.*)$" "\\1" SQLITE_VERSION_NUMBER ${SQLITE_VERSION_NUMBER1})
 
   message("Detected version of SQLite: ${SQLITE_VERSION_NUMBER}")
diff -r 732b6a4ed541 -r 7f0aa3c0f659 UnitTestsSources/FromDcmtkTests.cpp
--- a/UnitTestsSources/FromDcmtkTests.cpp	Mon Mar 30 15:12:21 2015 +0200
+++ b/UnitTestsSources/FromDcmtkTests.cpp	Mon Mar 30 15:28:19 2015 +0200
@@ -282,8 +282,6 @@
 
       std::string tag;
       ASSERT_TRUE(g.GetTagValue(tag, DICOM_TAG_PATIENT_NAME));
-
-      std::string expected();
       ASSERT_EQ(std::string(testEncodingsExpected[i]), tag);
     }
   }