From 4e2c4be9db9aeef1186466af64d9aa370408ea2e Mon Sep 17 00:00:00 2001 From: lisu Date: Tue, 7 Dec 2010 12:35:37 +0000 Subject: [PATCH] - obsoleted Changed files: opencv-2.0.0-libpng14.patch -> 1.3 opencv-2.1.0-mmap.patch -> 1.2 opencv-link.patch -> 1.2 --- opencv-2.0.0-libpng14.patch | 13 ------------- opencv-2.1.0-mmap.patch | 14 -------------- opencv-link.patch | 10 ---------- 3 files changed, 37 deletions(-) delete mode 100644 opencv-2.0.0-libpng14.patch delete mode 100644 opencv-2.1.0-mmap.patch delete mode 100644 opencv-link.patch diff --git a/opencv-2.0.0-libpng14.patch b/opencv-2.0.0-libpng14.patch deleted file mode 100644 index e0594d3..0000000 --- a/opencv-2.0.0-libpng14.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://www.libpng.org/pub/png/src/libpng-1.2.x-to-1.4.x-summary.txt - ---- modules/highgui/src/grfmt_png.cpp -+++ modules/highgui/srcgrfmt_png.cpp -@@ -223,7 +223,7 @@ - png_set_palette_to_rgb( png_ptr ); - - if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) -- png_set_gray_1_2_4_to_8( png_ptr ); -+ png_set_expand_gray_1_2_4_to_8( png_ptr ); - - if( CV_MAT_CN(m_type) > 1 && color ) - png_set_bgr( png_ptr ); // convert RGB to BGR diff --git a/opencv-2.1.0-mmap.patch b/opencv-2.1.0-mmap.patch deleted file mode 100644 index b7bbc9b..0000000 --- a/opencv-2.1.0-mmap.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://code.ros.org/trac/opencv/ticket/141 -http://bugs.gentoo.org/313649 - ---- src/highgui/cvcap_libv4l.cpp -+++ src/highgui/cvcap_libv4l.cpp -@@ -782,7 +782,7 @@ - - capture->buffers[n_buffers].length = buf.length; - capture->buffers[n_buffers].start = -- mmap (NULL /* start anywhere */, -+ v4l2_mmap (NULL /* start anywhere */, - buf.length, - PROT_READ | PROT_WRITE /* required */, - MAP_SHARED /* recommended */, diff --git a/opencv-link.patch b/opencv-link.patch deleted file mode 100644 index dde4807..0000000 --- a/opencv-link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- OpenCV-2.2.0/CMakeLists.txt~ 2010-12-07 11:47:33.354861668 +0100 -+++ OpenCV-2.2.0/CMakeLists.txt 2010-12-07 12:43:06.802865668 +0100 -@@ -429,6 +429,7 @@ - endif() - if(WITH_V4L) - CHECK_MODULE(libv4l1 HAVE_LIBV4L) -+ CHECK_MODULE(libv4l2 HAVE_LIBV4L2) - CHECK_INCLUDE_FILE(linux/videodev.h HAVE_CAMV4L) - CHECK_INCLUDE_FILE(linux/videodev2.h HAVE_CAMV4L2) - else() -- 2.43.0