<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/67f6b32d1f3c05940370d7fa9eaa1efdd8536f9d">https://github.com/macports/macports-ports/commit/67f6b32d1f3c05940370d7fa9eaa1efdd8536f9d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 67f6b32 opencv: update version 3.2.0->3.3.1
</span>67f6b32 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 67f6b32d1f3c05940370d7fa9eaa1efdd8536f9d
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Dec 16 20:00:50 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> opencv: update version 3.2.0->3.3.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/55315
</span>---
graphics/opencv/Portfile | 33 ++++++-------
graphics/opencv/files/patch-32bit_accelerate.diff | 54 +++++++++++-----------
graphics/opencv/files/patch-appleclang.diff | 16 +++++++
graphics/opencv/files/patch-find-openexr.diff | 13 ++----
graphics/opencv/files/patch-freetype.diff | 11 -----
.../files/patch-modules_java_CMakeLists.txt.diff | 11 -----
.../files/patch-modules_python_CMakeLists.txt.diff | 12 -----
graphics/opencv/files/patch-window_cocoa.mm.diff | 46 ------------------
8 files changed, 63 insertions(+), 133 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/Portfile b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b989d8..6e3bf0f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
name opencv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +32,11 @@ distfiles ${distname}.zip:opencv
</span> use_zip yes
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 09da1443a5ef3de036b11bf0d1f384da36d459d9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d2000ced54662e509adde1d781bf78526cc50fb4498d97a022d6f673c7bd175c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2ec36bda0facee5546eba7edf98c17949373d9b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932 \
</span> ${version}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0973c57ea36f38a64cc95eced43b3cf52dc15b58 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8f1937984d0130b38975346f0c18199c443706f75ab81b3dfda46c4550b4508b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 79a231b9a428732e8405292fe1099675c89af912 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4140441557a2d5ab0c4bb8cd891e00c4dd27618f8d310d344ee470dc7790fc48
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,13 +53,10 @@ depends_lib-append port:zlib \
</span> path:lib/libavcodec.dylib:ffmpeg
patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-modules_python_CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-modules_java_CMakeLists.txt.diff \
</span> patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/53333
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-window_cocoa.mm.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#recognize AppleClang as well as Clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-appleclang.diff
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/OpenCVFindOpenEXR.cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,6 +134,8 @@ configure.args-append \
</span> -DBUILD_OPENEXR=OFF \
-DBUILD_TBB=OFF \
\
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_opencv_java=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span> -DPYTHON_EXECUTABLE=OFF \
-DBUILD_opencv_python2=OFF \
-DBUILD_opencv_python3=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,11 +151,10 @@ platform darwin {
</span> # do not opportunistically find other LAPACK implementations
# see cmake/OpenCVFindLAPACK.cmake
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_INCLUDE_DIR=Accelerate \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_IMPL=Apple \
</span> -DLAPACK_LIBRARIES="-framework Accelerate" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_CBLAS_H=cblas.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_LAPACKE_H=lapacke.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLAPACK_IMPL=Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_CBLAS_H=Accelerate/Accelerate.h \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLAPACK_LAPACKE_H=Accelerate/Accelerate.h
</span>
if { ${build_arch} eq "i386" || ${build_arch} eq "ppc" || [variant_isset universal] } {
#The Accelerate ABI requires 32-bit signed integers.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -262,7 +260,8 @@ variant qt5 conflicts qt4 description {Build with Qt5 Backend support.} {
</span>
variant java description {Add Java bindings.} {
depends_build-append port:apache-ant
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-modules_java_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DBUILD_opencv_java=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_opencv_java=ON
</span> }
if {[variant_isset java] && ![variant_isset python27] && ![variant_isset python34]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,8 +350,6 @@ variant contrib description {Build OpenCV with extra modules.} {
</span> # less than ideal way for patchfiles to be applied to contrib directory
ln -s ${workpath}/opencv_contrib-${version} ${worksrcpath}/opencv_contrib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/53339
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-freetype.diff
</span> }
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-32bit_accelerate.diff b/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b452514..2c4bfb6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-32bit_accelerate.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/core/src/hal_internal.cpp.orig 2017-01-15 13:05:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/core/src/hal_internal.cpp 2017-01-15 13:06:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/core/src/hal_internal.cpp.orig 2017-10-23 08:41:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/core/src/hal_internal.cpp 2017-12-16 09:06:29.000000000 -0700
</span> @@ -108,9 +108,9 @@
if(n == 1 && b_step == sizeof(fptype))
{
if(typeid(fptype) == typeid(float))
- sgesv_(&m, &n, (float*)a, &lda, piv, (float*)b, &m, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (float*)b, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (float*)b, (__CLPK_integer*)&m, (__CLPK_integer*)info);
</span> else if(typeid(fptype) == typeid(double))
- dgesv_(&m, &n, (double*)a, &lda, piv, (double*)b, &m, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (double*)b, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (double*)b, (__CLPK_integer*)&m, (__CLPK_integer*)info);
</span> }
else
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,10 +17,10 @@
</span>
if(typeid(fptype) == typeid(float))
- sgesv_(&m, &n, (float*)a, &lda, piv, (float*)tmpB, &m, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (float*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (float*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*)info);
</span> else if(typeid(fptype) == typeid(double))
- dgesv_(&m, &n, (double*)a, &lda, piv, (double*)tmpB, &m, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (double*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesv_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (double*)tmpB, (__CLPK_integer*)&m, (__CLPK_integer*)info);
</span>
transpose(tmpB, m, b, ldb, n, m);
delete[] tmpB;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +29,10 @@
</span> {
if(typeid(fptype) == typeid(float))
- sgetrf_(&m, &m, (float*)a, &lda, piv, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgetrf_((__CLPK_integer*)&m, (__CLPK_integer*)&m, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgetrf_((__CLPK_integer*)&m, (__CLPK_integer*)&m, (float*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (__CLPK_integer*)info);
</span> else if(typeid(fptype) == typeid(double))
- dgetrf_(&m, &m, (double*)a, &lda, piv, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgetrf_((__CLPK_integer*)&m, (__CLPK_integer*)&m, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgetrf_((__CLPK_integer*)&m, (__CLPK_integer*)&m, (double*)a, (__CLPK_integer*)&lda, (__CLPK_integer*)piv, (__CLPK_integer*)info);
</span> }
if(*info == 0)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,20 +77,20 @@
</span>
if(typeid(fptype) == typeid(float))
- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)&work1, &lwork, iworkBuf, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)w, (float*)u, (__CLPK_integer*)&ldu, (float*)vt, (__CLPK_integer*)&ldv, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)w, (float*)u, (__CLPK_integer*)&ldu, (float*)vt, (__CLPK_integer*)&ldv, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*)info);
</span> else if(typeid(fptype) == typeid(double))
- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)&work1, &lwork, iworkBuf, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)w, (double*)u, (__CLPK_integer*)&ldu, (double*)vt, (__CLPK_integer*)&ldv, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)w, (double*)u, (__CLPK_integer*)&ldu, (double*)vt, (__CLPK_integer*)&ldv, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*)info);
</span>
lwork = (int)round(work1); //optimal buffer size
fptype* buffer = new fptype[lwork + 1];
if(typeid(fptype) == typeid(float))
- sgesdd_(mode, &m, &n, (float*)a, &lda, (float*)w, (float*)u, &ldu, (float*)vt, &ldv, (float*)buffer, &lwork, iworkBuf, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)w, (float*)u, (__CLPK_integer*)&ldu, (float*)vt, (__CLPK_integer*)&ldv, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)a, (__CLPK_integer*)&lda, (float*)w, (float*)u, (__CLPK_integer*)&ldu, (float*)vt, (__CLPK_integer*)&ldv, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*)info);
</span> else if(typeid(fptype) == typeid(double))
- dgesdd_(mode, &m, &n, (double*)a, &lda, (double*)w, (double*)u, &ldu, (double*)vt, &ldv, (double*)buffer, &lwork, iworkBuf, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)w, (double*)u, (__CLPK_integer*)&ldu, (double*)vt, (__CLPK_integer*)&ldv, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgesdd_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)a, (__CLPK_integer*)&lda, (double*)w, (double*)u, (__CLPK_integer*)&ldu, (double*)vt, (__CLPK_integer*)&ldv, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)iworkBuf, (__CLPK_integer*)info);
</span>
if(!(flags & CV_HAL_SVD_NO_UV))
transpose_square_inplace(vt, ldv, n);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,21 +99,21 @@
</span> {
if (typeid(fptype) == typeid(float))
- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)&work1, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)b, (__CLPK_integer*)&m, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)b, (__CLPK_integer*)&m, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> else if (typeid(fptype) == typeid(double))
- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)&work1, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)b, (__CLPK_integer*)&m, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)b, (__CLPK_integer*)&m, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = cvRound(work1); //optimal buffer size
</span> std::vector<fptype> workBufMemHolder(lwork + 1);
fptype* buffer = &workBufMemHolder.front();
if (typeid(fptype) == typeid(float))
- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)b, &m, (float*)buffer, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)b, (__CLPK_integer*)&m, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)b, (__CLPK_integer*)&m, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> else if (typeid(fptype) == typeid(double))
- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)b, &m, (double*)buffer, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)b, (__CLPK_integer*)&m, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)b, (__CLPK_integer*)&m, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> }
else
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,21 +122,21 @@
</span>
if (typeid(fptype) == typeid(float))
- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)&work1, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)tmpB, (__CLPK_integer*)&m, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)tmpB, (__CLPK_integer*)&m, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> else if (typeid(fptype) == typeid(double))
- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)&work1, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)tmpB, (__CLPK_integer*)&m, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)tmpB, (__CLPK_integer*)&m, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = cvRound(work1); //optimal buffer size
</span> std::vector<fptype> workBufMemHolder(lwork + 1);
fptype* buffer = &workBufMemHolder.front();
if (typeid(fptype) == typeid(float))
- sgels_(mode, &m, &n, &k, (float*)tmpA, &ldtmpA, (float*)tmpB, &m, (float*)buffer, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)tmpB, (__CLPK_integer*)&m, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)tmpB, (__CLPK_integer*)&m, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> else if (typeid(fptype) == typeid(double))
- dgels_(mode, &m, &n, &k, (double*)tmpA, &ldtmpA, (double*)tmpB, &m, (double*)buffer, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)tmpB, (__CLPK_integer*)&m, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgels_(mode, (__CLPK_integer*)&m, (__CLPK_integer*)&n, (__CLPK_integer*)&k, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)tmpB, (__CLPK_integer*)&m, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span>
transpose(tmpB, m, b, ldb, k, m);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -145,21 +145,21 @@
</span> {
if (typeid(fptype) == typeid(float))
- sgeqrf_(&m, &n, (float*)tmpA, &ldtmpA, (float*)dst, (float*)&work1, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)dst, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)dst, (float*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> else if (typeid(fptype) == typeid(double))
- dgeqrf_(&m, &n, (double*)tmpA, &ldtmpA, (double*)dst, (double*)&work1, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)dst, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)dst, (double*)&work1, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lwork = (int)round(work1); //optimal buffer size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lwork = cvRound(work1); //optimal buffer size
</span> std::vector<fptype> workBufMemHolder(lwork + 1);
fptype* buffer = &workBufMemHolder.front();
if (typeid(fptype) == typeid(float))
- sgeqrf_(&m, &n, (float*)tmpA, &ldtmpA, (float*)dst, (float*)buffer, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)dst, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (float*)tmpA, (__CLPK_integer*)&ldtmpA, (float*)dst, (float*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> else if (typeid(fptype) == typeid(double))
- dgeqrf_(&m, &n, (double*)tmpA, &ldtmpA, (double*)dst, (double*)buffer, &lwork, info);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)dst, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*) info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dgeqrf_((__CLPK_integer*)&m, (__CLPK_integer*)&n, (double*)tmpA, (__CLPK_integer*)&ldtmpA, (double*)dst, (double*)buffer, (__CLPK_integer*)&lwork, (__CLPK_integer*)info);
</span> }
if (m == n)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-appleclang.diff b/graphics/opencv/files/patch-appleclang.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..33570a5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-appleclang.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/OpenCVDetectCXXCompiler.cmake.orig 2017-10-23 08:41:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/OpenCVDetectCXXCompiler.cmake 2017-12-16 19:22:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,11 +5,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(MSVC64 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_COMPILER_IS_GNUCXX 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_COMPILER_IS_CLANGCXX 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CMAKE_C_COMPILER_ID MATCHES ".*Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_COMPILER_IS_GNUCC 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_COMPILER_IS_CLANGCC 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-find-openexr.diff b/graphics/opencv/files/patch-find-openexr.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c3fffea..20da604 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-find-openexr.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-find-openexr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/orig.OpenCVFindOpenEXR.cmake 2015-12-18 16:02:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/OpenCVFindOpenEXR.cmake 2016-10-22 19:39:27.377104513 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,25 +21,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/OpenCVFindOpenEXR.cmake.orig 2017-12-16 18:52:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/OpenCVFindOpenEXR.cmake 2017-12-16 18:53:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,24 +21,16 @@
</span> SET(OPENEXR_LIBSEARCH_SUFFIXES Win32/Release Win32 Win32/Debug)
endif()
else()
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,8 +13,7 @@
</span> - /usr/local/lib
- /sw/lib
- /opt/local/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${ProgramFiles_ENV_PATH}/OpenEXR/lib/static"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @PREFIX@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${ProgramFiles_ENV_PATH}/OpenEXR/lib/static"
</span> "${OPENEXR_ROOT}/lib")
FIND_PATH(OPENEXR_INCLUDE_PATH ImfRgbaFile.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +23,6 @@
</span> - /usr/local/include
- /sw/include
- /opt/local/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${ProgramFiles_ENV_PATH}/OpenEXR/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${ProgramFiles_ENV_PATH}/OpenEXR/include"
</span> "${OPENEXR_ROOT}/include")
<span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_LIBRARY(OPENEXR_HALF_LIBRARY
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-freetype.diff b/graphics/opencv/files/patch-freetype.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 76d16b4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-freetype.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- opencv_contrib/modules/freetype/CMakeLists.txt.orig 2016-12-23 04:09:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ opencv_contrib/modules/freetype/CMakeLists.txt 2017-01-21 05:17:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if( FREETYPE_FOUND AND HARFBUZZ_FOUND )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ocv_define_module(freetype opencv_core opencv_imgproc PRIVATE_REQUIRED ${freetype2_LIBRARIES} ${harfbuzz_LIBRARIES} WRAP python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ocv_define_module(freetype opencv_core opencv_imgproc PRIVATE_REQUIRED ${FREETYPE_LIBRARIES} ${HARFBUZZ_LIBRARIES} WRAP python)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ocv_include_directories( ${FREETYPE_INCLUDE_DIRS} ${HARFBUZZ_INCLUDE_DIRS} )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ocv_module_disable(freetype)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff b/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f01120b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-modules_java_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/java/CMakeLists.txt.orig 2015-12-23 23:35:34.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/java/CMakeLists.txt 2015-12-23 23:36:25.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMake file for java support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ocv_module_disable(java)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE_FRAMEWORK OR WINRT OR NOT PYTHON_DEFAULT_AVAILABLE OR NOT ANT_EXECUTABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OR NOT (JNI_FOUND OR (ANDROID AND ANDROID_NATIVE_API_LEVEL GREATER 7))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OR BUILD_opencv_world
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff b/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0c13150..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-modules_python_CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/python/CMakeLists.txt.orig 2015-04-27 19:27:04.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/python/CMakeLists.txt 2015-04-27 19:26:31.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CMake file for python support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ----------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ocv_module_disable(python2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ocv_module_disable(python3)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((WIN32 AND CMAKE_BUILD_TYPE STREQUAL "Debug")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OR BUILD_opencv_world
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-window_cocoa.mm.diff b/graphics/opencv/files/patch-window_cocoa.mm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f7102e1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-window_cocoa.mm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/highgui/src/window_cocoa.mm.orig 2016-12-23 05:54:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/highgui/src/window_cocoa.mm 2017-01-20 16:07:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,11 +83,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool wasInitialized = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface CVView : NSView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+NSImage *image;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(strong) NSImage *image;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)setImageData:(CvArr *)arr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface CVSlider : NSView
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+NSSlider *slider;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+NSTextField *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int *value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void *userData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CvTrackbarCallback callback;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CvTrackbarCallback2 callback2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(strong) NSSlider *slider;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(strong) NSTextField *name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(assign) int *value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -97,6 +112,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface CVWindow : NSWindow
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CvMouseCallback mouseCallback;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void *mouseParam;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BOOL autosize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BOOL firstContent;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+NSMutableDictionary *sliders;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(assign) CvMouseCallback mouseCallback;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(assign) void *mouseParam;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @property(assign) BOOL autosize;
</span></pre><pre style='margin:0'>
</pre>