diff --git a/opencv-2.4.11-listfilterout.patch b/opencv-2.4.11-listfilterout.patch deleted file mode 100644 index 14de6e2..0000000 --- a/opencv-2.4.11-listfilterout.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- opencv-2.4.11/samples/gpu/CMakeLists.txt.orig 2015-02-25 13:10:31.000000000 +0100 -+++ opencv-2.4.11/samples/gpu/CMakeLists.txt 2015-05-19 18:35:11.803554049 +0200 -@@ -4,6 +4,15 @@ - opencv_superres) - ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS}) - -+# remove all matching elements from the list -+MACRO(list_filterout lst regex) -+ foreach(item ${${lst}}) -+ if(item MATCHES "${regex}") -+ list(REMOVE_ITEM ${lst} "${item}") -+ endif() -+ endforeach() -+ENDMACRO() -+ - if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) - set(project "gpu") - string(TOUPPER "${project}" project_upper) -@@ -69,15 +78,6 @@ - endif() - ENDMACRO() - -- # remove all matching elements from the list -- MACRO(list_filterout lst regex) -- foreach(item ${${lst}}) -- if(item MATCHES "${regex}") -- list(REMOVE_ITEM ${lst} "${item}") -- endif() -- endforeach() -- ENDMACRO() -- - file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) - - if(NOT HAVE_OPENGL) diff --git a/opencv-2.4.12.3-gcc6.patch b/opencv-2.4.12.3-gcc6.patch deleted file mode 100644 index 71f7b5b..0000000 --- a/opencv-2.4.12.3-gcc6.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/modules/contrib/src/chamfermatching.cpp b/modules/contrib/src/chamfermatching.cpp ---- a/modules/contrib/src/chamfermatching.cpp -+++ b/modules/contrib/src/chamfermatching.cpp -@@ -966,10 +966,8 @@ void ChamferMatcher::Matching::computeDistanceTransform(Mat& edges_img, Mat& dis - for (int y=0;y(y,x)[0]=x; -- annotate_img.at(y,x)[1]=y; -- } -+ annotate_img.at(y,x)[0]=x; -+ annotate_img.at(y,x)[1]=y; - - uchar edge_val = edges_img.at(y,x); - if( (edge_val!=0) ) { -@@ -1013,10 +1011,8 @@ void ChamferMatcher::Matching::computeDistanceTransform(Mat& edges_img, Mat& dis - dist_img.at(ny,nx) = dist; - q.push(std::make_pair(nx,ny)); - -- if (&annotate_img!=NULL) { -- annotate_img.at(ny,nx)[0]=annotate_img.at(y,x)[0]; -- annotate_img.at(ny,nx)[1]=annotate_img.at(y,x)[1]; -- } -+ annotate_img.at(ny,nx)[0]=annotate_img.at(y,x)[0]; -+ annotate_img.at(ny,nx)[1]=annotate_img.at(y,x)[1]; - } - } - } -@@ -1107,26 +1103,22 @@ ChamferMatcher::Match* ChamferMatcher::Matching::localChamferDistance(Point offs - - float cost = (sum_distance/truncate_)/addr.size(); - -+ float* optr = orientation_img.ptr(y)+x; -+ float sum_orientation = 0; -+ int cnt_orientation = 0; - -- if (&orientation_img!=NULL) { -- float* optr = orientation_img.ptr(y)+x; -- float sum_orientation = 0; -- int cnt_orientation = 0; -+ for (size_t i=0;iorientations[i]>=-CV_PI && (*(optr+addr[i]))>=-CV_PI) { -- sum_orientation += orientation_diff(tpl->orientations[i], (*(optr+addr[i]))); -- cnt_orientation++; -- } -+ if(addr[i] < (orientation_img.cols*orientation_img.rows) - (offset.y*orientation_img.cols + offset.x)){ -+ if (tpl->orientations[i]>=-CV_PI && (*(optr+addr[i]))>=-CV_PI) { -+ sum_orientation += orientation_diff(tpl->orientations[i], (*(optr+addr[i]))); -+ cnt_orientation++; - } - } -+ } - -- if (cnt_orientation>0) { -- cost = (float)(beta*cost+alpha*(sum_orientation/(2*CV_PI))/cnt_orientation); -- } -- -+ if (cnt_orientation>0) { -+ cost = (float)(beta*cost+alpha*(sum_orientation/(2*CV_PI))/cnt_orientation); - } - - if(cost > 0){ -