potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #3039 from alalek:ocv_world

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-08-06 14:52:52 +00:00
parent bab5700a09 fc0f254f00
commit ca183707f2
146 changed files with 633 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/perf/opencl/perf_3vs4.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
// Copyright (C) 2014, Advanced Micro Devices, Inc., all rights reserved.
// Third party copyrights are property of their respective owners.
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_accumulate.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_blend.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_color.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_filters.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_gftt.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#include <sstream>
modules/imgproc/perf/opencl/perf_imgproc.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_imgwarp.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_matchTemplate.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_moments.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/perf/opencl/perf_pyramid.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//
//M*/
#include "perf_precomp.hpp"
#include "../perf_precomp.hpp"
#include "opencv2/ts/ocl_perf.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/src/accum.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv
{
modules/imgproc/src/blend.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv {
modules/imgproc/src/canny.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
modules/imgproc/src/clahe.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
// ----------------------------------------------------------------------
// CLAHE
modules/imgproc/src/color.cpp
+1 -1
View File
@@ -90,7 +90,7 @@
\**********************************************************************************/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
#include <limits>
#define CV_DESCALE(x,n) (((x) + (1 << ((n)-1))) >> (n))
modules/imgproc/src/corner.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv
{
modules/imgproc/src/deriv.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
static IppStatus sts = ippInit();
modules/imgproc/src/featureselect.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
#include <cstdio>
#include <vector>
modules/imgproc/src/filter.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
/****************************************************************************************\
Base Image Filter
modules/imgproc/src/histogram.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv
{
modules/imgproc/src/imgwarp.cpp
+1 -1
View File
@@ -47,7 +47,7 @@
// */
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
static IppStatus sts = ippInit();
modules/imgproc/src/moments.cpp
+1 -1
View File
@@ -39,7 +39,7 @@
//
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv
{
modules/imgproc/src/morph.cpp
+1 -1
View File
@@ -42,7 +42,7 @@
#include "precomp.hpp"
#include <limits.h>
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
/****************************************************************************************\
Basic Morphological Operations: Erosion & Dilation
modules/imgproc/src/pyramids.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv
{
modules/imgproc/src/smooth.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
/*
* This file includes the code, contributed by Simon Perreault
modules/imgproc/src/sumpixels.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
static IppStatus sts = ippInit();
modules/imgproc/src/templmatch.cpp
+1 -1
View File
@@ -40,7 +40,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
////////////////////////////////////////////////// matchTemplate //////////////////////////////////////////////////////////
modules/imgproc/src/thresh.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//M*/
#include "precomp.hpp"
#include "opencl_kernels.hpp"
#include "opencl_kernels_imgproc.hpp"
namespace cv
{
modules/imgproc/test/ocl/test_accumulate.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "cvconfig.h"
#include "opencv2/ts/ocl_test.hpp"
modules/imgproc/test/ocl/test_blend.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "cvconfig.h"
#include "opencv2/ts/ocl_test.hpp"
modules/imgproc/test/ocl/test_boxfilter.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_canny.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_color.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_filter2d.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_filters.cpp
+1 -1
View File
@@ -48,7 +48,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "cvconfig.h"
#include "opencv2/ts/ocl_test.hpp"
modules/imgproc/test/ocl/test_gftt.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_histogram.cpp
+1 -1
View File
@@ -52,7 +52,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "cvconfig.h"
#include "opencv2/ts/ocl_test.hpp"
modules/imgproc/test/ocl/test_imgproc.cpp
+1 -1
View File
@@ -51,7 +51,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "cvconfig.h"
#include "opencv2/ts/ocl_test.hpp"
modules/imgproc/test/ocl/test_match_template.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#include "iostream"
#include "fstream"
modules/imgproc/test/ocl/test_medianfilter.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_pyramids.cpp
+1 -1
View File
@@ -44,7 +44,7 @@
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_sepfilter2D.cpp
+1 -1
View File
@@ -41,7 +41,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL
modules/imgproc/test/ocl/test_warp.cpp
+1 -1
View File
@@ -51,7 +51,7 @@
//
//M*/
#include "test_precomp.hpp"
#include "../test_precomp.hpp"
#include "opencv2/ts/ocl_test.hpp"
#ifdef HAVE_OPENCL