From 451ce4cee2b8e7767a020484a2468ef21ba685dd Mon Sep 17 00:00:00 2001 From: markd Date: Sun, 15 Apr 2012 03:49:00 +0000 Subject: Update to 2.3.1 Add a python option (off by default). 2.3.1 (August, 2011) New Functionality and Features * Retina module has been contributed by Alexandre Benoit (in opencv_contrib module). * Planar subdivisions construction (Delaunay triangulation and Voronoi tesselation) have been ported to C++. See the new delaunay2.cpp sample. * Several new Python samples have been added. * FLANN in OpenCV has been upgraded to v1.6. Also, added Python bindings for FLANN. * We now support the latest FFMPEG (0.8.x) that features multi-threaded decoding. Reading videos in OpenCV has never been that fast. * Over 100 issues have been resolved since 2.3 release. 2.3 (July, 2011) Modifications and Improvements since 2.3rc * A few more bugs reported in the OpenCV bug tracker have been fixed. * Documentation has been improved a lot! 2.3rc (June, 2011) New Functionality, Features * Many functions and methods now take InputArray/OutputArray instead of "cv::Mat" references. It retains compatibility with the existing code and yet brings more natural support for STL vectors and potentially other "foreign" data structures to OpenCV. core: * LAPACK is not used by OpenCV anymore. * Arithmetic operations now support mixed-type operands and arbitrary number of channels. features2d: * Completely new patent-free BRIEF and ORB feature descriptors have been added. * Very fast LSH matcher for BRIEF and ORB descriptors will be added in 2.3.1. calib3d: * calibration.cpp sample. With the new pattern calibration accuracy is usually much higher. stitching: * opencv_stitching is a beta version of new application that makes a panorama out of a set of photos taken from the same point. python: * Now there are 2 extension modules: cv and cv2. cv2 includes wrappers for OpenCV 2.x functionality. opencv/samples/python2 contain a few samples demonstrating cv2 in use. * Over 250 issues have been resolved. --- graphics/opencv/Makefile | 20 ++--- graphics/opencv/PLIST | 130 ++++++++++++++++----------- graphics/opencv/distinfo | 12 ++- graphics/opencv/options.mk | 21 +++++ graphics/opencv/patches/patch-CMakeLists.txt | 93 +++---------------- graphics/opencv/patches/patch-aa | 16 ---- graphics/opencv/patches/patch-ab | 60 ------------- 7 files changed, 122 insertions(+), 230 deletions(-) create mode 100644 graphics/opencv/options.mk delete mode 100644 graphics/opencv/patches/patch-aa delete mode 100644 graphics/opencv/patches/patch-ab (limited to 'graphics') diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 0c37a1a4f24..a26941eed8a 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2012/04/03 18:57:22 adam Exp $ +# $NetBSD: Makefile,v 1.22 2012/04/15 03:49:00 markd Exp $ -DISTNAME= OpenCV-2.2.0 -PKGNAME= ${DISTNAME:S/OpenCV/opencv/} -PKGREVISION= 5 +DISTNAME= OpenCV-2.3.1a +PKGNAME= ${DISTNAME:S/OpenCV/opencv/:S/a$//} CATEGORIES= graphics devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opencvlibrary/} EXTRACT_SUFX= .tar.bz2 @@ -24,16 +23,11 @@ INSTALLATION_DIRS+= share/doc/opencv/papers share/doc/opencv/ref/pics \ PKGCONFIG_OVERRIDE+= opencv.pc.cmake.in -SUBST_CLASSES+= py -SUBST_STAGE.py= pre-configure -SUBST_FILES.py= samples/python/*.py -SUBST_SED.py= -e 's,/usr/bin/python,/usr/bin/env python,' +REPLACE_PYTHON+= samples/python/*.py -#CONFIGURE_ARGS+=--with-swig=no -CMAKE_ARGS+= -D BUILD_NEW_PYTHON_SUPPORT=OFF -# FIXME: should be option.mk'ed instead -CMAKE_ARGS+= -D WITH_OPENEXR:BOOL=OFF -CMAKE_ARGS+= -D BUILD_DOXYGEN_DOCS=OFF +WRKSRC= ${WRKDIR}/${DISTNAME:S/a$//} + +.include "options.mk" post-install: ${RM} ${DESTDIR}${PREFIX}/include/opencv2/core/*.orig diff --git a/graphics/opencv/PLIST b/graphics/opencv/PLIST index 2135f835f22..51d63dfa4b5 100644 --- a/graphics/opencv/PLIST +++ b/graphics/opencv/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.5 2010/12/05 10:36:40 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2012/04/15 03:49:00 markd Exp $ bin/opencv_createsamples bin/opencv_haartraining bin/opencv_performance +bin/opencv_stitching bin/opencv_traincascade include/opencv/cv.h include/opencv/cv.hpp @@ -16,6 +17,7 @@ include/opencv/highgui.h include/opencv/ml.h include/opencv2/calib3d/calib3d.hpp include/opencv2/contrib/contrib.hpp +include/opencv2/contrib/retina.hpp include/opencv2/core/core.hpp include/opencv2/core/core_c.h include/opencv2/core/eigen.hpp @@ -28,31 +30,45 @@ include/opencv2/core/wimage.hpp include/opencv2/features2d/features2d.hpp include/opencv2/flann/all_indices.h include/opencv2/flann/allocator.h +include/opencv2/flann/any.h include/opencv2/flann/autotuned_index.h include/opencv2/flann/composite_index.h +include/opencv2/flann/config.h +include/opencv2/flann/defines.h include/opencv2/flann/dist.h +include/opencv2/flann/dummy.h +include/opencv2/flann/dynamic_bitset.h include/opencv2/flann/flann.hpp include/opencv2/flann/flann_base.hpp include/opencv2/flann/general.h include/opencv2/flann/ground_truth.h include/opencv2/flann/hdf5.h include/opencv2/flann/heap.h +include/opencv2/flann/hierarchical_clustering_index.h include/opencv2/flann/index_testing.h include/opencv2/flann/kdtree_index.h +include/opencv2/flann/kdtree_single_index.h include/opencv2/flann/kmeans_index.h include/opencv2/flann/linear_index.h include/opencv2/flann/logger.h +include/opencv2/flann/lsh_index.h +include/opencv2/flann/lsh_table.h include/opencv2/flann/matrix.h +include/opencv2/flann/miniflann.hpp include/opencv2/flann/nn_index.h include/opencv2/flann/object_factory.h +include/opencv2/flann/params.h include/opencv2/flann/random.h include/opencv2/flann/result_set.h include/opencv2/flann/sampling.h include/opencv2/flann/saving.h include/opencv2/flann/simplex_downhill.h include/opencv2/flann/timer.h +include/opencv2/gpu/NCV.hpp +include/opencv2/gpu/NPP_staging.hpp include/opencv2/gpu/devmem2d.hpp include/opencv2/gpu/gpu.hpp +include/opencv2/gpu/gpumat.hpp include/opencv2/gpu/matrix_operations.hpp include/opencv2/gpu/stream_accessor.hpp include/opencv2/highgui/highgui.hpp @@ -67,82 +83,94 @@ include/opencv2/legacy/streams.hpp include/opencv2/ml/ml.hpp include/opencv2/objdetect/objdetect.hpp include/opencv2/opencv.hpp +include/opencv2/ts/ts.hpp +include/opencv2/ts/ts_gtest.h include/opencv2/video/background_segm.hpp include/opencv2/video/tracking.hpp +include/opencv2/video/video.hpp lib/libopencv_calib3d.so -lib/libopencv_calib3d.so.2.2 +lib/libopencv_calib3d.so.2.3 lib/libopencv_calib3d.so.${PKGVERSION} lib/libopencv_contrib.so -lib/libopencv_contrib.so.2.2 +lib/libopencv_contrib.so.2.3 lib/libopencv_contrib.so.${PKGVERSION} lib/libopencv_core.so -lib/libopencv_core.so.2.2 +lib/libopencv_core.so.2.3 lib/libopencv_core.so.${PKGVERSION} lib/libopencv_features2d.so -lib/libopencv_features2d.so.2.2 +lib/libopencv_features2d.so.2.3 lib/libopencv_features2d.so.${PKGVERSION} lib/libopencv_flann.so -lib/libopencv_flann.so.2.2 +lib/libopencv_flann.so.2.3 lib/libopencv_flann.so.${PKGVERSION} lib/libopencv_gpu.so -lib/libopencv_gpu.so.2.2 +lib/libopencv_gpu.so.2.3 lib/libopencv_gpu.so.${PKGVERSION} lib/libopencv_highgui.so -lib/libopencv_highgui.so.2.2 +lib/libopencv_highgui.so.2.3 lib/libopencv_highgui.so.${PKGVERSION} lib/libopencv_imgproc.so -lib/libopencv_imgproc.so.2.2 +lib/libopencv_imgproc.so.2.3 lib/libopencv_imgproc.so.${PKGVERSION} lib/libopencv_legacy.so -lib/libopencv_legacy.so.2.2 +lib/libopencv_legacy.so.2.3 lib/libopencv_legacy.so.${PKGVERSION} lib/libopencv_ml.so -lib/libopencv_ml.so.2.2 +lib/libopencv_ml.so.2.3 lib/libopencv_ml.so.${PKGVERSION} lib/libopencv_objdetect.so -lib/libopencv_objdetect.so.2.2 +lib/libopencv_objdetect.so.2.3 lib/libopencv_objdetect.so.${PKGVERSION} +lib/libopencv_ts.so +lib/libopencv_ts.so.2.3 +lib/libopencv_ts.so.${PKGVERSION} lib/libopencv_video.so -lib/libopencv_video.so.2.2 +lib/libopencv_video.so.2.3 lib/libopencv_video.so.${PKGVERSION} lib/pkgconfig/opencv.pc -share/opencv/OpenCVConfig.cmake -share/opencv/doc/CMakeLists.txt -share/opencv/doc/README.txt -share/opencv/doc/haartraining.htm -share/opencv/doc/license.txt -share/opencv/doc/opencv-logo.png -share/opencv/doc/opencv-logo2.png -share/opencv/doc/opencv.jpg -share/opencv/doc/opencv.pdf -share/opencv/doc/opencv_cheatsheet.pdf -share/opencv/doc/packaging.txt -share/opencv/doc/papers/algo_tracking.pdf -share/opencv/doc/papers/avbpa99.ps -share/opencv/doc/papers/camshift.pdf -share/opencv/doc/pattern.pdf -share/opencv/doc/vidsurv/Blob_Tracking_Modules.doc -share/opencv/doc/vidsurv/Blob_Tracking_Tests.doc -share/opencv/doc/vidsurv/TestSeq.doc -share/opencv/haarcascades/haarcascade_eye.xml -share/opencv/haarcascades/haarcascade_eye_tree_eyeglasses.xml -share/opencv/haarcascades/haarcascade_frontalface_alt.xml -share/opencv/haarcascades/haarcascade_frontalface_alt2.xml -share/opencv/haarcascades/haarcascade_frontalface_alt_tree.xml -share/opencv/haarcascades/haarcascade_frontalface_default.xml -share/opencv/haarcascades/haarcascade_fullbody.xml -share/opencv/haarcascades/haarcascade_lefteye_2splits.xml -share/opencv/haarcascades/haarcascade_lowerbody.xml -share/opencv/haarcascades/haarcascade_mcs_eyepair_big.xml -share/opencv/haarcascades/haarcascade_mcs_eyepair_small.xml -share/opencv/haarcascades/haarcascade_mcs_lefteye.xml -share/opencv/haarcascades/haarcascade_mcs_mouth.xml -share/opencv/haarcascades/haarcascade_mcs_nose.xml -share/opencv/haarcascades/haarcascade_mcs_righteye.xml -share/opencv/haarcascades/haarcascade_mcs_upperbody.xml -share/opencv/haarcascades/haarcascade_profileface.xml -share/opencv/haarcascades/haarcascade_righteye_2splits.xml -share/opencv/haarcascades/haarcascade_upperbody.xml -share/opencv/lbpcascades/lbpcascade_frontalface.xml +${PLIST.python}${PYSITELIB}/cv.py +${PLIST.python}${PYSITELIB}/cv2.so +share/OpenCV/OpenCVConfig-version.cmake +share/OpenCV/OpenCVConfig.cmake +share/OpenCV/doc/CMakeLists.txt +share/OpenCV/doc/acircles_pattern.png +share/OpenCV/doc/check_docs_whitelist.txt +share/OpenCV/doc/haartraining.htm +share/OpenCV/doc/license.txt +share/OpenCV/doc/opencv-logo.png +share/OpenCV/doc/opencv-logo2.png +share/OpenCV/doc/opencv.jpg +share/OpenCV/doc/opencv2refman.pdf +share/OpenCV/doc/opencv_cheatsheet.pdf +share/OpenCV/doc/opencv_tutorials.pdf +share/OpenCV/doc/opencv_user.pdf +share/OpenCV/doc/packaging.txt +share/OpenCV/doc/pattern.png +share/OpenCV/doc/vidsurv/Blob_Tracking_Modules.doc +share/OpenCV/doc/vidsurv/Blob_Tracking_Tests.doc +share/OpenCV/doc/vidsurv/TestSeq.doc +share/OpenCV/haarcascades/haarcascade_eye.xml +share/OpenCV/haarcascades/haarcascade_eye_tree_eyeglasses.xml +share/OpenCV/haarcascades/haarcascade_frontalface_alt.xml +share/OpenCV/haarcascades/haarcascade_frontalface_alt2.xml +share/OpenCV/haarcascades/haarcascade_frontalface_alt_tree.xml +share/OpenCV/haarcascades/haarcascade_frontalface_default.xml +share/OpenCV/haarcascades/haarcascade_fullbody.xml +share/OpenCV/haarcascades/haarcascade_lefteye_2splits.xml +share/OpenCV/haarcascades/haarcascade_lowerbody.xml +share/OpenCV/haarcascades/haarcascade_mcs_eyepair_big.xml +share/OpenCV/haarcascades/haarcascade_mcs_eyepair_small.xml +share/OpenCV/haarcascades/haarcascade_mcs_leftear.xml +share/OpenCV/haarcascades/haarcascade_mcs_lefteye.xml +share/OpenCV/haarcascades/haarcascade_mcs_mouth.xml +share/OpenCV/haarcascades/haarcascade_mcs_nose.xml +share/OpenCV/haarcascades/haarcascade_mcs_rightear.xml +share/OpenCV/haarcascades/haarcascade_mcs_righteye.xml +share/OpenCV/haarcascades/haarcascade_mcs_upperbody.xml +share/OpenCV/haarcascades/haarcascade_profileface.xml +share/OpenCV/haarcascades/haarcascade_righteye_2splits.xml +share/OpenCV/haarcascades/haarcascade_upperbody.xml +share/OpenCV/lbpcascades/lbpcascade_frontalface.xml +@pkgdir share/opencv/haarcascades @pkgdir share/doc/opencv/ref/pics @pkgdir share/doc/opencv/papers diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index d675e0dce5a..fe534c73da3 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.9 2012/04/03 18:57:22 adam Exp $ +$NetBSD: distinfo,v 1.10 2012/04/15 03:49:00 markd Exp $ -SHA1 (OpenCV-2.2.0.tar.bz2) = 984ed71672d50391d0617fce2ef58e7590ec0fd7 -RMD160 (OpenCV-2.2.0.tar.bz2) = 57aedb7678964f43af3f1c838a8266c7b4869b01 -Size (OpenCV-2.2.0.tar.bz2) = 19800873 bytes -SHA1 (patch-CMakeLists.txt) = f9954b7bf2972d0cfa0a653e62b7a65147441bb9 -SHA1 (patch-aa) = 3a95649075b2ca94d39ced3c00da6a90b5834881 -SHA1 (patch-ab) = 66936658e5ec12c479c29388916edd399c7feca6 +SHA1 (OpenCV-2.3.1a.tar.bz2) = 9784e6824c5f677fac82ae83a2f366743adb3299 +RMD160 (OpenCV-2.3.1a.tar.bz2) = f2f459bf7c163acb90427db2b0b425ab8008cde5 +Size (OpenCV-2.3.1a.tar.bz2) = 32669613 bytes +SHA1 (patch-CMakeLists.txt) = eb27b6cf8877b22bce4a27b7c27e637f5f3b4c52 SHA1 (patch-modules_core_include_opencv2_core_core.hpp) = 3936d23ad51f82536bb73428754d131259b8bf05 diff --git a/graphics/opencv/options.mk b/graphics/opencv/options.mk new file mode 100644 index 00000000000..45322177a62 --- /dev/null +++ b/graphics/opencv/options.mk @@ -0,0 +1,21 @@ +# $NetBSD: options.mk,v 1.1 2012/04/15 03:49:00 markd Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.opencv +PKG_SUPPORTED_OPTIONS= python + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= python +.if !empty(PKG_OPTIONS:Mpython) +CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} +PY_PATCHPLIST= yes +.include "../../lang/python/extension.mk" +.include "../../math/py-numpy/buildlink3.mk" +PLIST.python= yes +.else +CMAKE_ARGS+= -D BUILD_NEW_PYTHON_SUPPORT=OFF +.endif + +# FIXME: should be option.mk'ed instead +CMAKE_ARGS+= -D WITH_OPENEXR:BOOL=OFF +CMAKE_ARGS+= -D BUILD_DOXYGEN_DOCS=OFF diff --git a/graphics/opencv/patches/patch-CMakeLists.txt b/graphics/opencv/patches/patch-CMakeLists.txt index 553bd976430..da5d7fa6e89 100644 --- a/graphics/opencv/patches/patch-CMakeLists.txt +++ b/graphics/opencv/patches/patch-CMakeLists.txt @@ -1,86 +1,13 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2012/04/03 18:57:22 adam Exp $ - -Fix configuring on Mac OS X. +$NetBSD: patch-CMakeLists.txt,v 1.3 2012/04/15 03:49:00 markd Exp $ --- CMakeLists.txt.orig 2010-12-05 03:35:23.000000000 +0000 +++ CMakeLists.txt -@@ -206,7 +206,7 @@ set(BUILD_TESTS ON CACHE BOOL "Build tes - - # Build 3rdparty libraries under unix - # =================================================== --if(WIN32 OR APPLE) -+if(WIN32) - set(OPENCV_BUILD_3RDPARTY_LIBS TRUE CACHE BOOL "Build 3rd party libraries") - else() - set(OPENCV_BUILD_3RDPARTY_LIBS FALSE CACHE BOOL "Build 3rd party libraries") -@@ -437,34 +437,7 @@ if(UNIX) - set(HAVE_CAMV4L2 FALSE) - endif() - -- if(NOT OPENCV_BUILD_3RDPARTY_LIBS) -- if(WITH_PNG) -- include(FindPNG) -- if(PNG_FOUND) -- CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H) -- CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H) -- endif() -- else() -- set(PNG_FOUND FALSE) -- endif() -- if(WITH_TIFF) -- include(FindTIFF) -- else() -- set(TIFF_FOUND FALSE) -- endif() -- if(WITH_JASPER) -- include(FindJasper) -- else() -- set(JASPER_FOUND FALSE) -- endif() -- if(WITH_JPEG) -- include(FindJPEG) -- else() -- set(JPEG_FOUND FALSE) -- endif() -- endif() -- -- if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") -+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") - set(OPENCV_LINKER_LIBS m pthread) - else() - set(OPENCV_LINKER_LIBS dl m pthread rt) -@@ -472,6 +445,34 @@ if(UNIX) - else() - add_definitions(-DHAVE_ALLOCA -DHAVE_ALLOCA_H -DHAVE_LIBPTHREAD -DHAVE_UNISTD_H) - endif() -+ -+ if(NOT OPENCV_BUILD_3RDPARTY_LIBS) -+ if(WITH_PNG) -+ include(FindPNG) -+ if(PNG_FOUND) -+ CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/png.h HAVE_PNG_H) -+ CHECK_INCLUDE_FILE(${PNG_PNG_INCLUDE_DIR}/libpng/png.h HAVE_LIBPNG_PNG_H) -+ endif() -+ else() -+ set(PNG_FOUND FALSE) -+ endif() -+ if(WITH_TIFF) -+ include(FindTIFF) -+ else() -+ set(TIFF_FOUND FALSE) -+ endif() -+ if(WITH_JASPER) -+ include(FindJasper) -+ else() -+ set(JASPER_FOUND FALSE) -+ endif() -+ if(WITH_JPEG) -+ include(FindJPEG) -+ else() -+ set(JPEG_FOUND FALSE) -+ endif() -+ endif() -+ - endif() - - if(WITH_PNG AND NOT PNG_FOUND) +@@ -590,7 +590,7 @@ if(UNIX) + + if(ANDROID) + set(OPENCV_LINKER_LIBS dl m log) +- elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") ++ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD" OR ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly") + set(OPENCV_LINKER_LIBS m pthread) + else() + set(OPENCV_LINKER_LIBS dl m pthread rt) diff --git a/graphics/opencv/patches/patch-aa b/graphics/opencv/patches/patch-aa deleted file mode 100644 index f9abdfe6828..00000000000 --- a/graphics/opencv/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2011/12/14 18:27:22 marino Exp $ - -NetBSD doesn't have expl(3) yet. -https://code.ros.org/trac/opencv/ticket/736 - ---- modules/ml/src/gbt.cpp.orig 2010-12-05 03:35:25.000000000 +0000 -+++ modules/ml/src/gbt.cpp -@@ -11,7 +11,7 @@ using namespace std; - #define CV_CMP_FLOAT(a,b) ((a) < (b)) - static CV_IMPLEMENT_QSORT_EX( icvSortFloat, float, CV_CMP_FLOAT, float) - --#if ANDROID -+#if defined(ANDROID) || defined(__DragonFly__) || defined(__NetBSD__) - #define expl(x) exp(x) - #endif - diff --git a/graphics/opencv/patches/patch-ab b/graphics/opencv/patches/patch-ab deleted file mode 100644 index c5b853126ac..00000000000 --- a/graphics/opencv/patches/patch-ab +++ /dev/null @@ -1,60 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2011/01/24 14:37:51 wiz Exp $ - -Fix build with png-1.5. -https://code.ros.org/trac/opencv/ticket/834 - ---- modules/highgui/src/grfmt_png.cpp.orig 2010-12-05 03:35:25.000000000 +0000 -+++ modules/highgui/src/grfmt_png.cpp -@@ -56,6 +56,7 @@ - #else - #include - #endif -+#include - #include "grfmt_png.hpp" - - namespace cv -@@ -107,7 +108,7 @@ void PngDecoder::close() - void PngDecoder::readDataFromBuf( void* _png_ptr, uchar* dst, size_t size ) - { - png_structp png_ptr = (png_structp)_png_ptr; -- PngDecoder* decoder = (PngDecoder*)(png_ptr->io_ptr); -+ PngDecoder* decoder = (PngDecoder*)(png_get_io_ptr(png_ptr)); - CV_Assert( decoder ); - const Mat& buf = decoder->m_buf; - if( decoder->m_buf_pos + size > buf.cols*buf.rows*buf.elemSize() ) -@@ -138,7 +139,7 @@ bool PngDecoder::readHeader() - - 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 @@ bool PngDecoder::readData( Mat& img ) - 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; - -@@ -280,7 +281,7 @@ void PngEncoder::writeDataToBuf(void* _p - if( size == 0 ) - return; - png_structp png_ptr = (png_structp)_png_ptr; -- PngEncoder* encoder = (PngEncoder*)(png_ptr->io_ptr); -+ PngEncoder* encoder = (PngEncoder*)(png_get_io_ptr(png_ptr)); - CV_Assert( encoder && encoder->m_buf ); - size_t cursz = encoder->m_buf->size(); - encoder->m_buf->resize(cursz + size); -@@ -322,7 +323,7 @@ bool PngEncoder::write( const Mat& img, - - if( info_ptr ) - { -- if( setjmp( png_ptr->jmpbuf ) == 0 ) -+ if( setjmp( png_jmpbuf ( png_ptr ) ) == 0 ) - { - if( m_buf ) - { -- cgit v1.2.3