opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-23 00:49:38 +08:00
Code Issues Releases Wiki Activity

Merge pull request #32 from vbystricky/highgui_imgcodecs

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-07-10 13:33:16 +04:00
parent a6a799572d a164e6252f
commit 36178bc92c
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/reg/samples/map_test.cpp
View File

@@ -38,10 +38,12 @@
#include <iostream>
#define _USE_MATH_DEFINES
#include <cmath>
#include <opencv2/imgcodecs.hpp>
#include <opencv2/highgui.hpp> // OpenCV window I/O
#include <opencv2/imgproc.hpp> // OpenCV image transformations
#include <opencv2/imgproc.hpp>
#include <opencv2/imgproc/types_c.h>
#include <opencv2/imgcodecs/imgcodecs_c.h>
#include <opencv2/highgui/highgui_c.h>
#ifdef COMPARE_FEATURES

16
modules/tracking/test/test_trackerSRE.cpp
View File

@@ -343,32 +343,32 @@ void TrackerSRETest::checkDataTest()
break;
case 5:
//corner shift top-left
bb.x = (int)round( bb.x - 0.1 * bb.width );
bb.y = (int)round( bb.y - 0.1 * bb.height );
bb.x = (int)cvRound( bb.x - 0.1 * bb.width );
bb.y = (int)cvRound( bb.y - 0.1 * bb.height );
bb.width = xLimit - bb.x + 1;
bb.height = yLimit - bb.y + 1;
break;
case 6:
//corner shift top-right
xLimit = (int)round( xLimit + 0.1 * bb.width );
xLimit = (int)cvRound( xLimit + 0.1 * bb.width );
bb.y = (int)round( bb.y - 0.1 * bb.height );
bb.y = (int)cvRound( bb.y - 0.1 * bb.height );
bb.width = xLimit - bb.x + 1;
bb.height = yLimit - bb.y + 1;
break;
case 7:
//corner shift bottom-left
bb.x = (int)round( bb.x - 0.1 * bb.width );
yLimit = (int)round( yLimit + 0.1 * bb.height );
bb.x = (int)cvRound( bb.x - 0.1 * bb.width );
yLimit = (int)cvRound( yLimit + 0.1 * bb.height );
bb.width = xLimit - bb.x + 1;
bb.height = yLimit - bb.y + 1;
break;
case 8:
//corner shift bottom-right
xLimit = (int)round( xLimit + 0.1 * bb.width );
yLimit = (int)round( yLimit + 0.1 * bb.height );
xLimit = (int)cvRound( xLimit + 0.1 * bb.width );
yLimit = (int)cvRound( yLimit + 0.1 * bb.height );
bb.width = xLimit - bb.x + 1;
bb.height = yLimit - bb.y + 1;

2
modules/xobjdetect/src/precomp.hpp
View File

@@ -48,7 +48,7 @@ the use of this software, even if advised of the possibility of such damage.
#include <opencv2/imgproc.hpp>
#include <opencv2/imgproc/types_c.h>
#include <opencv2/highgui.hpp>
#include <opencv2/imgcodecs.hpp>
#include <algorithm>
#include <cmath>