diff --git a/src/beauty/beauty-demo.cpp b/src/beauty/beauty-demo.cpp index e31dc09a5..82a4fe49b 100644 --- a/src/beauty/beauty-demo.cpp +++ b/src/beauty/beauty-demo.cpp @@ -164,7 +164,6 @@ void reduce_shadows(const cv::UMat& srcBGR, cv::UMat& dstBGR, double to_percent) cv::add(valueFloat, cv::Scalar::all(minOut), valueFloat); valueFloat.convertTo(hsvChannels[2], CV_8U, 255.0); - cv::merge(hsvChannels, hsv); cvtColor(hsv, dstBGR, cv::COLOR_HSV2BGR); } @@ -215,10 +214,9 @@ int main(int argc, char **argv) { cv::UMat lhalf(HEIGHT * SCALE, WIDTH * SCALE, CV_8UC3); cv::UMat rhalf(lhalf.size(), lhalf.type()); //GREY - cv::UMat downGrey, faceBgMaskGrey, faceBgMaskInvGrey, faceFgMaskGrey; + cv::UMat downGrey, faceBgMaskGrey, faceBgMaskInvGrey, faceFgMaskGrey, resMaskGrey; //BGR-Float cv::UMat videoFrameOutFloat; - cv::UMat white(HEIGHT, WIDTH, CV_8U, cv::Scalar::all(255)); cv::Mat faces; vector faceRects; vector> shapes; @@ -273,7 +271,7 @@ int main(int argc, char **argv) { blender.prepare(cv::Rect(0,0, WIDTH,HEIGHT)); blender.feed(reduced, faceBgMaskGrey, cv::Point(0,0)); blender.feed(resized, faceBgMaskInvGrey, cv::Point(0,0)); - blender.blend(videoFrameOutFloat, white); + blender.blend(videoFrameOutFloat, resMaskGrey); videoFrameOutFloat.convertTo(videoFrameOut, CV_8U, 1.0); cv::boxFilter(videoFrameOut, blurred, -1, cv::Size(BLUR_KERNEL_SIZE, BLUR_KERNEL_SIZE), cv::Point(-1, -1), true, cv::BORDER_REPLICATE); @@ -282,7 +280,7 @@ int main(int argc, char **argv) { cv::add(videoFrameOut, masked, videoFrameOut); cv::resize(resized, lhalf, cv::Size(0, 0), 0.5, 0.5); - cv::resize(videoFrameOut, rhalf, cv::Size(0, 0), 0.5, 0.5); + cv::resize(reduced, rhalf, cv::Size(0, 0), 0.5, 0.5); } else { gl::acquire_from_gl(frameBuffer); cv::resize(resized, lhalf, cv::Size(0, 0), 0.5, 0.5); diff --git a/src/optflow/optflow-demo.cpp b/src/optflow/optflow-demo.cpp index 8d2d18321..42eb01802 100644 --- a/src/optflow/optflow-demo.cpp +++ b/src/optflow/optflow-demo.cpp @@ -38,7 +38,7 @@ constexpr int MAX_STROKE = 17; // Intensity of glow defined by kernel size. The default scales with the image diagonal. constexpr int GLOW_KERNEL_SIZE = DIAG / 138 % 2 == 0 ? DIAG / 138 + 1 : DIAG / 138; //hue, saturation, lightness and alpha all from 0 to 255 -const cv::Scalar COLOR(26, 255, 153, 7); +const cv::Scalar EFFECT_COLOR(26, 255, 153, 7); using std::cerr; using std::endl; @@ -237,7 +237,7 @@ int main(int argc, char **argv) { nvg::clear(); if (!downPrevGrey.empty()) { if (!detect_scene_change(downMotionMaskGrey, SCENE_CHANGE_THRESH, SCENE_CHANGE_THRESH_DIFF)) { - visualize_sparse_optical_flow(downPrevGrey, downNextGrey, detectedPoints, FG_SCALE, MAX_STROKE, COLOR, MAX_POINTS, POINT_LOSS); + visualize_sparse_optical_flow(downPrevGrey, downNextGrey, detectedPoints, FG_SCALE, MAX_STROKE, EFFECT_COLOR, MAX_POINTS, POINT_LOSS); } } nvg::end();