Merge branch 'dev' into dehaze_speedup

CMakeLists.txt

@@ -136,6 +136,9 @@ option(TRACE_MYRWMUTEX "Trace custom R/W Mutex (Debug builds only); redirecting
 option(AUTO_GDK_FLUSH "Use gdk_flush on all gdk_thread_leave other than the GUI thread; set it ON if you experience X Server warning/errors" OFF)
 #option(TARGET32BIT "Build for 32-bit architecture when ON, otherwise 64-bit. Default is OFF" OFF)
 
+option(ENABLE_TCMALLOC "Use the tcmalloc library if available" OFF)
+set(TCMALLOC_LIB_DIR "" CACHE PATH "Custom path for the tcmalloc library")
+
 # Set installation directories:
 if(WIN32 OR APPLE)
     if(BUILD_BUNDLE)
@@ -564,6 +567,23 @@ int main()
     return 0;
 }" LENSFUN_HAS_LOAD_DIRECTORY)
 
+set(TCMALLOC_LIB_DIR)
+if(ENABLE_TCMALLOC)
+    if(TCMALLOC_LIB_DIR)
+        find_library(TCMALLOC_LIBRARIES tcmalloc PATHS ${TCMALLOC_LIB_DIR} NO_DEFAULT_PATH)
+    else()
+        find_library(TCMALLOC_LIBRARIES tcmalloc)
+    endif()
+    if(TCMALLOC_LIBRARIES)
+        message(STATUS "using tcmalloc library in ${TCMALLOC_LIBRARIES}")
+    else()
+        set(TCMALLOC_LIBRARIES "" CACHE INTERNAL "" FORCE)
+        message(STATUS "tcmalloc not found")
+    endif()
+else()
+    set(TCMALLOC_LIBRARIES "" CACHE INTERNAL "" FORCE)
+endif()
+
 
 add_subdirectory(rtexif)
 add_subdirectory(rtengine)

rtengine/dcraw.cc

@@ -4216,8 +4216,8 @@ void CLASS foveon_interpolate()
 	  foveon_avg (image[row*width]+c, dscr[1], cfilt) * 3
 	  - ddft[0][c][0] ) / 4 - ddft[0][c][1];
   }
-  memcpy (black, black+8, sizeof *black*8);
-  memcpy (black+height-11, black+height-22, 11*sizeof *black);
+  memmove (black, black+8, sizeof *black*8);
+  memmove (black+height-11, black+height-22, 11*sizeof *black);
   memcpy (last, black, sizeof last);
 
   for (row=1; row < height-1; row++) {

rtengine/filmnegativeproc.cc

@@ -77,8 +77,8 @@ bool channelsAvg(
     }
 
     std::array<int, 3> pxCount = {}; // Per-channel sample counts
-    for (int c = spotPos.x - spotSize; c < spotPos.x + spotSize; ++c) {
-        for (int r = spotPos.y - spotSize; r < spotPos.y + spotSize; ++r) {
+    for (int c = x1; c < x2; ++c) {
+        for (int r = y1; r < y2; ++r) {
             const int ch = ri->getSensorType() == rtengine::ST_BAYER ? ri->FC(r,c) : ri->XTRANSFC(r,c);
 
             ++pxCount[ch];

rtgui/CMakeLists.txt

@@ -286,6 +286,7 @@ target_link_libraries(rth rtengine
     ${ZLIB_LIBRARIES}
     ${LENSFUN_LIBRARIES}
     ${RSVG_LIBRARIES}
+    ${TCMALLOC_LIBRARIES}
     )
 
 target_link_libraries(rth-cli rtengine
@@ -307,6 +308,7 @@ target_link_libraries(rth-cli rtengine
     ${ZLIB_LIBRARIES}
     ${LENSFUN_LIBRARIES}
     ${RSVG_LIBRARIES}
+    ${TCMALLOC_LIBRARIES}
     )
 
 # Install executables