head	1.4;
access;
symbols
	pkgsrc-2024Q4:1.3.0.74
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.72
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.70
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.68
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.66
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.64
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.62
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.60
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.58
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.56
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.54
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.52
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.50
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.48
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.46
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.44
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.42
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.40
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.36
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.16
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.38
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.34
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.32
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.30
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.28
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.26
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.24
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.22
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.20
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.18
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.14
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.12
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.10
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.8
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.6
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.4
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.2
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.2.0.20
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.18
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.16
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.14
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.12
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.10
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.8
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.6
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.4
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.2
	pkgsrc-2013Q2-base:1.2;
locks; strict;
comment	@// @;


1.4
date	2025.02.07.21.54.17;	author wiz;	state dead;
branches;
next	1.3;
commitid	RS8OGY8QeR4wlAIF;

1.3
date	2015.10.08.17.45.59;	author fhajny;	state Exp;
branches;
next	1.2;
commitid	diAE3W0NRpqBzkEy;

1.2
date	2013.06.19.11.54.04;	author fhajny;	state Exp;
branches;
next	1.1;
commitid	GFTIRMX5JjmyFdUw;

1.1
date	2013.06.12.10.13.58;	author jperkin;	state Exp;
branches;
next	;
commitid	S5GjoCSKbMU8ljTw;


desc
@@


1.4
log
@opencv: update to 4.11.0.

This is the new major version under the Apache 2 license.
Too many changes to list, no concise summary found. Details at:
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs-v2.2%E2%80%90v4.10
https://github.com/opencv/opencv/wiki/OpenCV-Change-Logs#version4110
@
text
@$NetBSD: patch-modules_ts_src_ts.cpp,v 1.3 2015/10/08 17:45:59 fhajny Exp $

Avoid std::foo conflict.

--- modules/ts/src/ts.cpp.orig	2015-06-03 17:21:34.000000000 +0000
+++ modules/ts/src/ts.cpp
@@@@ -235,7 +235,7 @@@@ void BaseTest::safe_run( int start_from
         }
         catch (const TS::FailureCode& fc)
         {
-            std::string errorStr = TS::str_from_code(fc);
+            ::std::string errorStr = TS::str_from_code(fc);
             ts->printf(TS::LOG, "General failure:\n\t%s (%d)\n", errorStr.c_str(), fc);
 
             ts->set_failed_test_info( fc );
@@@@ -558,7 +558,7 @@@@ void TS::vprintf( int streams, const cha
     for( int i = 0; i < MAX_IDX; i++ )
         if( (streams & (1 << i)) )
         {
-            output_buf[i] += std::string(str);
+            output_buf[i] += ::std::string(str);
             // in the new GTest-based framework we do not use
             // any output files (except for the automatically generated xml report).
             // if a test fails, all the buffers are printed, so we do not want to duplicate the information and
@@@@ -613,7 +613,7 @@@@ void smoothBorder(Mat& img, const Scalar
     Scalar s;
     uchar *p = NULL;
     int n = 100/delta;
-    int nR = std::min(n, (img.rows+1)/2), nC = std::min(n, (img.cols+1)/2);
+    int nR = ::std::min(n, (img.rows+1)/2), nC = ::std::min(n, (img.cols+1)/2);
 
     int r, c, i;
     for(r=0; r<nR; r++)
@


1.3
log
@Update graphics/opencv to 3.0.0.

Major changes (besides bugfixes):
- opencv_contrib (http://github.com/itseez/opencv_contrib) repository
  has been added.
- a subset of Intel IPP (IPPCV) is given to us and our users free
  of charge, free of licensing fees, for commercial and non-commerical
  use.
- T-API (transparent API) has been introduced, this is transparent GPU
  acceleration layer using OpenCL. It does not add any compile-time or
  runtime dependency of OpenCL. When OpenCL is available, it's detected
  and used, but it can be disabled at compile time or at runtime.
- ~40 OpenCV functions have been accelerated using NEON intrinsics and
  because these are mostly basic functions, some higher-level functions
  got accelerated as well.
- There is also new OpenCV HAL layer that will simplifies creation
  of NEON-optimized code and that should form a base for the open-source
  and proprietary OpenCV accelerators.
- The documentation is now in Doxygen: http://docs.opencv.org/master/
- We cleaned up API of many high-level algorithms from features2d, calib3d,
  objdetect etc. They now follow the uniform "abstract interface - hidden
  implementation" pattern and make extensive use of smart pointers (Ptr<>).
- Greatly improved and extended Python & Java bindings (also, see below on
  the Python bindings), newly introduced Matlab bindings
- Improved Android support - now OpenCV Manager is in Java and supports
  both 2.4 and 3.0.
- Greatly improved WinRT support, including video capturing and
  multi-threading capabilities. Thanks for Microsoft team for this!
- Big thanks to Google who funded several successive GSoC programs and
  let OpenCV in. The results of many successful GSoC 2013 and 2014 projects
  have been integrated in opencv 3.0 and opencv_contrib (earlier results
  are also available in OpenCV 2.4.x). We can name:
  - text detection
  - many computational photography algorithms (HDR, inpainting, edge-aware
    filters, superpixels,...)
  - tracking and optical flow algorithms
  - new features, including line descriptors, KAZE/AKAZE
  - general use optimization (hill climbing, linear programming)
  - greatly improved Python support, including Python 3.0 support, many new
    tutorials & samples on how to use OpenCV with Python.
  - 2d shape matching module and 3d surface matching module
  - RGB-D module
  - VTK-based 3D visualization module

For full changelog see:

  http://code.opencv.org/projects/opencv/wiki/ChangeLog

For 2.4 to 3.0 transition, see the transition guide:

  http://docs.opencv.org/master/db/dfa/tutorial_transition_guide.html
@
text
@d1 1
a1 1
$NetBSD: patch-modules_ts_src_ts.cpp,v 1.2 2013/06/19 11:54:04 fhajny Exp $
@


1.2
log
@Fix build with SunOS and GCC 4.7.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- modules/ts/src/ts.cpp.orig	2013-04-05 09:00:20.000000000 +0000
d7 10
a16 1
@@@@ -562,7 +562,7 @@@@ void TS::vprintf( int streams, const cha
d25 1
a25 1
@@@@ -617,7 +617,7 @@@@ void smoothBorder(Mat& img, const Scalar
@


1.1
log
@Add patches required for SunOS support.
@
text
@d3 1
a3 1
Avoid std::string conflict.
d5 1
a5 1
--- modules/ts/src/ts.cpp.orig	2012-07-25 22:55:31.000000000 +0000
d7 1
a7 1
@@@@ -557,7 +557,7 @@@@ void TS::vprintf( int streams, const cha
d16 9
@