diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-03-30 03:14:29 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-03-30 03:14:29 +0000 |
| commit | fa1b03416055e85bb72c527abce69d32d15e8989 (patch) | |
| tree | c83e8cbdf12cb970505c1dc6dd72324f5d3b6882 /graphics/opencv | |
| parent | de590da0c58314b3b2de9df828beab00ee51a4b7 (diff) | |
| download | ports-fa1b03416055e85bb72c527abce69d32d15e8989.tar.gz ports-fa1b03416055e85bb72c527abce69d32d15e8989.zip | |
Notes
Diffstat (limited to 'graphics/opencv')
| -rw-r--r-- | graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp | 10 | ||||
| -rw-r--r-- | graphics/opencv/files/patch-src-highgui-grfmt_png.cpp | 40 |
2 files changed, 50 insertions, 0 deletions
diff --git a/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp b/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp index e7c23020c903..f2ba12401e74 100644 --- a/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp +++ b/graphics/opencv/files/patch-src-highgui-cvcap_v4l.cpp @@ -8,3 +8,13 @@ #include <assert.h> #include <sys/stat.h> #include <sys/ioctl.h> +@@ -646,8 +646,7 @@ + + static void v4l2_scan_controls(CvCaptureCAM_V4L* capture) + { +- +- __u32 ctrl_id; ++ uint32_t ctrl_id; + + for (ctrl_id = V4L2_CID_BASE; + ctrl_id < V4L2_CID_LASTP1; diff --git a/graphics/opencv/files/patch-src-highgui-grfmt_png.cpp b/graphics/opencv/files/patch-src-highgui-grfmt_png.cpp new file mode 100644 index 000000000000..c0d79d218fbc --- /dev/null +++ b/graphics/opencv/files/patch-src-highgui-grfmt_png.cpp @@ -0,0 +1,40 @@ +--- src/highgui/grfmt_png.cpp.orig 2009-10-01 03:20:58.000000000 +0300 ++++ src/highgui/grfmt_png.cpp 2010-03-29 19:24:40.000000000 +0300 +@@ -138,7 +138,8 @@ + + if( info_ptr && end_info ) + { +- if( setjmp( png_ptr->jmpbuf ) == 0 ) ++ ++ if ( (setjmp(png_jmpbuf(png_ptr))) == 0 ) + { + if( !m_buf.empty() ) + png_set_read_fn(png_ptr, this, (png_rw_ptr)readDataFromBuf ); +@@ -200,7 +201,7 @@ + png_infop info_ptr = (png_infop)m_info_ptr; + png_infop end_info = (png_infop)m_end_info; + +- if( setjmp(png_ptr->jmpbuf) == 0 ) ++if ( (setjmp(png_jmpbuf(png_ptr))) == 0 ) + { + int y; + +@@ -223,7 +224,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 +@@ -322,7 +323,8 @@ + + if( info_ptr ) + { +- if( setjmp( png_ptr->jmpbuf ) == 0 ) ++ ++if ( (setjmp(png_jmpbuf(png_ptr))) == 0 ) + { + if( m_buf ) + { |