<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05e8432d773442379bb2694c25c03a939b7691f0">https://github.com/macports/macports-ports/commit/05e8432d773442379bb2694c25c03a939b7691f0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 05e8432d773442379bb2694c25c03a939b7691f0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Sep 17 07:40:05 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4{,-devel}: update to 4.8.0
</span>---
graphics/opencv4-devel/Portfile | 48 ++++++++++++--------
.../files/patch-highgui-scrollwheel.diff | 31 +++++++++++++
graphics/opencv4/Portfile | 51 +++++++++++++---------
.../opencv4/files/patch-highgui-scrollwheel.diff | 31 +++++++++++++
4 files changed, 121 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/Portfile b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 408fc8d9a15..cb491800c13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,15 @@ if {${os.major} > 12} {
</span>
# NOTE: Separate revisions maintained for Python subports, later in portfile
if {${opencv_latest}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup opencv opencv 4.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup opencv opencv 4.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> epoch 1
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4eccdc53879ae30df58d7181703957ae5ebc745f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c10593ef1ecdd6830628730044ea286e11c4a4913c328eb901d3a4ee00cad8fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 90218202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 afc8f7c1ba53cb2b787df24f53285bbbc96e9d1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d94c5fe77952a78ccc2dbaa5468955064994c9c58ca3caa5765e12a166e1eff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 91992992 \
</span> } else {
github.setup opencv opencv 4.5.0
revision 23
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +104,16 @@ set parent_subport_name \
</span> # recognize dylib as a valid library suffix
patchfiles-append patch-dylib_suffix.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${opencv_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Drop scrollwheel code, for 10.11 and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-highgui-scrollwheel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #worksrcdir ${parent_subport_name}-${version}
# Claims to only need c++11 but actually uses c++14 features
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,17 +136,17 @@ depends_build-append \
</span> port:python${default_python_version}
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ade \
</span> path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:imath \
</span> path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span> port:libquirc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span> port:tiff \
port:webp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:imath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
#------------------------------------------------------------------------------
# CMake Variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,7 +354,7 @@ foreach python_branch ${python_branches} {
</span> subport py${python_version}-${name} {
# NOTE: Only rev-bump subports, for major changes/additions
if {${opencv_latest}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> } else {
revision 11
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -456,9 +466,9 @@ if {${name} eq ${subport}} {
</span> if {${opencv_latest}} {
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cb343c90ca33fb22b5ab120e926cfde640ce8d7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fb2c14c30739dd8e7f9cc357b81c0e7db4f0f28c1cec140200e736887a204e8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59669561
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c26e000779b6834b7960c82210cc8446d7081bcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f7545cb417af05174f97e84c0449d68a75de90ef6c4fbc2b5b3e5a3f7856030 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 59198140 \
</span> } else {
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -480,12 +490,12 @@ if {${name} eq ${subport}} {
</span> -DPROTOBUF_UPDATE_FILES:BOOL=ON
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ceres-solver \
</span> port:double-conversion \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:protobuf3-cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:google-glog \
</span> port:gflags \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ceres-solver \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:google-glog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf3-cpp
</span>
extract.only \
${github.project}-${version}${extract.suffix} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/files/patch-highgui-scrollwheel.diff b/graphics/opencv4-devel/files/patch-highgui-scrollwheel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..13c42e40ec5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/files/patch-highgui-scrollwheel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/highgui/src/window_cocoa.mm.orig 2023-09-19 07:42:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/highgui/src/window_cocoa.mm 2023-09-19 07:43:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -899,19 +899,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp.y *= (imageSize.height / std::max(viewSize.height, 1.));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp.x *= (imageSize.width / std::max(viewSize.width, 1.));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( [event type] == NSEventTypeScrollWheel ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( event.hasPreciseScrollingDeltas ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.x = int(event.scrollingDeltaX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.y = int(event.scrollingDeltaY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.x = int(event.scrollingDeltaX / 0.100006);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.y = int(event.scrollingDeltaY / 0.100006);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( mp.x && !mp.y && CV_EVENT_MOUSEWHEEL == type ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- type = CV_EVENT_MOUSEHWHEEL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mouseCallback(type, mp.x, mp.y, flags, mouseParam);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if( mp.x >= 0 && mp.y >= 0 && mp.x < imageSize.width && mp.y < imageSize.height ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( mp.x >= 0 && mp.y >= 0 && mp.x < imageSize.width && mp.y < imageSize.height ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mouseCallback(type, mp.x, mp.y, flags, mouseParam);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -937,7 +925,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([event type] == NSLeftMouseDragged) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEMOVE flags:flags | CV_EVENT_FLAG_LBUTTON];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([event type] == NSRightMouseDragged) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEMOVE flags:flags | CV_EVENT_FLAG_RBUTTON];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([event type] == NSOtherMouseDragged) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEMOVE flags:flags | CV_EVENT_FLAG_MBUTTON];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if([event type] == NSEventTypeScrollWheel) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEWHEEL flags:flags ];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -(void)scrollWheel:(NSEvent *)theEvent {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcd23336ed3..10ca9d8e11e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,15 +52,15 @@ if {${os.major} > 12} {
</span>
# NOTE: Separate revisions maintained for Python subports, later in portfile
if {${opencv_latest}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup opencv opencv 4.6.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup opencv opencv 4.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> epoch 1
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 4eccdc53879ae30df58d7181703957ae5ebc745f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c10593ef1ecdd6830628730044ea286e11c4a4913c328eb901d3a4ee00cad8fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 90218202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 afc8f7c1ba53cb2b787df24f53285bbbc96e9d1d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3d94c5fe77952a78ccc2dbaa5468955064994c9c58ca3caa5765e12a166e1eff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 91992992 \
</span> } else {
github.setup opencv opencv 4.5.0
revision 27
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +104,16 @@ set parent_subport_name \
</span> # recognize dylib as a valid library suffix
patchfiles-append patch-dylib_suffix.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${opencv_latest}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Drop scrollwheel code, for 10.11 and earlier
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-highgui-scrollwheel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #worksrcdir ${parent_subport_name}-${version}
# Claims to only need c++11 but actually uses c++14 features
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,17 +136,17 @@ depends_build-append \
</span> port:python${default_python_version}
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ade \
</span> path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:imath \
</span> path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span> port:libquirc \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span> port:tiff \
port:webp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:imath \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ade
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
#------------------------------------------------------------------------------
# CMake Variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -344,7 +354,7 @@ foreach python_branch ${python_branches} {
</span> subport py${python_version}-${name} {
# NOTE: Only rev-bump subports, for major changes/additions
if {${opencv_latest}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> } else {
revision 17
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,7 +362,7 @@ foreach python_branch ${python_branches} {
</span> conflicts-append \
py${python_version}-opencv3 \
py${python_version}-opencv3-devel \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- py${python_version}-opencv4-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py${python_version}-opencv4
</span>
depends_build-delete \
port:python${default_python_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -456,9 +466,9 @@ if {${name} eq ${subport}} {
</span> if {${opencv_latest}} {
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 cb343c90ca33fb22b5ab120e926cfde640ce8d7d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fb2c14c30739dd8e7f9cc357b81c0e7db4f0f28c1cec140200e736887a204e8c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 59669561
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 c26e000779b6834b7960c82210cc8446d7081bcd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f7545cb417af05174f97e84c0449d68a75de90ef6c4fbc2b5b3e5a3f7856030 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 59198140 \
</span> } else {
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -480,18 +490,17 @@ if {${name} eq ${subport}} {
</span> -DPROTOBUF_UPDATE_FILES:BOOL=ON
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ceres-solver \
</span> port:double-conversion \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:protobuf3-cpp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:google-glog \
</span> port:gflags \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ceres-solver \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:google-glog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:protobuf3-cpp
</span>
extract.only \
${github.project}-${version}${extract.suffix} \
${github.project}_contrib-${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- extract.rename no
</span> post-extract {
move_gh_repo ${github.author}-${github.project}-* ${distname}
move_gh_repo ${github.author}-${github.project}_contrib-* ${github.project}_contrib-${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/files/patch-highgui-scrollwheel.diff b/graphics/opencv4/files/patch-highgui-scrollwheel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..13c42e40ec5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/files/patch-highgui-scrollwheel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/highgui/src/window_cocoa.mm.orig 2023-09-19 07:42:42.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/highgui/src/window_cocoa.mm 2023-09-19 07:43:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -899,19 +899,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp.y *= (imageSize.height / std::max(viewSize.height, 1.));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mp.x *= (imageSize.width / std::max(viewSize.width, 1.));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( [event type] == NSEventTypeScrollWheel ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( event.hasPreciseScrollingDeltas ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.x = int(event.scrollingDeltaX);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.y = int(event.scrollingDeltaY);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.x = int(event.scrollingDeltaX / 0.100006);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mp.y = int(event.scrollingDeltaY / 0.100006);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( mp.x && !mp.y && CV_EVENT_MOUSEWHEEL == type ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- type = CV_EVENT_MOUSEHWHEEL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mouseCallback(type, mp.x, mp.y, flags, mouseParam);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } else if( mp.x >= 0 && mp.y >= 0 && mp.x < imageSize.width && mp.y < imageSize.height ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( mp.x >= 0 && mp.y >= 0 && mp.x < imageSize.width && mp.y < imageSize.height ) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mouseCallback(type, mp.x, mp.y, flags, mouseParam);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -937,7 +925,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([event type] == NSLeftMouseDragged) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEMOVE flags:flags | CV_EVENT_FLAG_LBUTTON];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([event type] == NSRightMouseDragged) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEMOVE flags:flags | CV_EVENT_FLAG_RBUTTON];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if([event type] == NSOtherMouseDragged) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEMOVE flags:flags | CV_EVENT_FLAG_MBUTTON];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if([event type] == NSEventTypeScrollWheel) {[self cvSendMouseEvent:event type:CV_EVENT_MOUSEWHEEL flags:flags ];}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -(void)scrollWheel:(NSEvent *)theEvent {
</span></pre><pre style='margin:0'>
</pre>