Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/sfm/cmake/FindGflags.cmake

@@ -482,7 +482,7 @@ if (NOT GFLAGS_FOUND)
   endif (NOT GFLAGS_INCLUDE_DIR OR
     NOT EXISTS ${GFLAGS_INCLUDE_DIR})
 
-  find_library(GFLAGS_LIBRARY NAMES gflags
+  find_library(GFLAGS_LIBRARY NAMES gflags gflags_debug gflags_nothreads gflags_nothreads_debug
     PATHS ${GFLAGS_LIBRARY_DIR_HINTS}
     ${GFLAGS_CHECK_LIBRARY_DIRS}
     PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES})

modules/sfm/cmake/FindGlog.cmake

@@ -148,7 +148,7 @@ if (NOT GLOG_INCLUDE_DIR OR
 endif (NOT GLOG_INCLUDE_DIR OR
        NOT EXISTS ${GLOG_INCLUDE_DIR})
 
-find_library(GLOG_LIBRARY NAMES glog
+find_library(GLOG_LIBRARY NAMES glog glogd
   PATHS ${GLOG_LIBRARY_DIR_HINTS}
   ${GLOG_CHECK_LIBRARY_DIRS}
   PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES})

modules/xphoto/src/inpainting.cpp

@@ -83,7 +83,7 @@ namespace xphoto
         cv::resize(_src,  src,  _src.size()/ls,  0, 0,    cv::INTER_AREA);
 
         src.convertTo( img, CV_32F );
-        img.setTo(0, 255 - mask);
+        img.setTo(0, ~(mask > 0));
 
         cv::erode( mask,  dmask, cv::Mat(), cv::Point(-1,-1), 2);
         cv::erode(dmask, ddmask, cv::Mat(), cv::Point(-1,-1), 2);