Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
32a5e5fa
Commit
32a5e5fa
authored
Oct 17, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #12858 from janisozaur:catch-by-ref
parents
24ced3d6
c8e6ce30
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
19 deletions
+19
-19
copy.cpp
modules/core/src/copy.cpp
+1
-1
test_ds.cpp
modules/core/test/test_ds.cpp
+5
-5
canny.cpp
modules/imgproc/src/canny.cpp
+2
-2
deriv.cpp
modules/imgproc/src/deriv.cpp
+2
-2
morph.cpp
modules/imgproc/src/morph.cpp
+1
-1
resize.cpp
modules/imgproc/src/resize.cpp
+3
-3
smooth.cpp
modules/imgproc/src/smooth.cpp
+5
-5
No files found.
modules/core/src/copy.cpp
View file @
32a5e5fa
...
...
@@ -729,7 +729,7 @@ static bool ipp_flip(Mat &src, Mat &dst, int flip_mode)
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiMirror
,
iwSrc
,
iwDst
,
ippMode
);
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
modules/core/test/test_ds.cpp
View file @
32a5e5fa
...
...
@@ -1032,7 +1032,7 @@ void Core_SeqBaseTest::run( int )
cvClearMemStorage
(
storage
);
}
}
catch
(
int
)
catch
(
const
int
&
)
{
}
}
...
...
@@ -1200,7 +1200,7 @@ void Core_SeqSortInvTest::run( int )
storage
.
release
();
}
}
catch
(
int
)
catch
(
const
int
&
)
{
}
}
...
...
@@ -1416,7 +1416,7 @@ void Core_SetTest::run( int )
storage
.
release
();
}
}
catch
(
int
)
catch
(
const
int
&
)
{
}
}
...
...
@@ -1859,7 +1859,7 @@ void Core_GraphTest::run( int )
storage
.
release
();
}
}
catch
(
int
)
catch
(
const
int
&
)
{
}
}
...
...
@@ -2121,7 +2121,7 @@ void Core_GraphScanTest::run( int )
storage
.
release
();
}
}
catch
(
int
)
catch
(
const
int
&
)
{
}
}
...
...
modules/imgproc/src/canny.cpp
View file @
32a5e5fa
...
...
@@ -93,7 +93,7 @@ static bool ipp_Canny(const Mat& src , const Mat& dx_, const Mat& dy_, Mat& dst,
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterCannyDeriv
,
iwSrcDx
,
iwSrcDy
,
iwDst
,
low
,
high
,
::
ipp
::
IwiFilterCannyDerivParams
(
norm
));
}
catch
(
::
ipp
::
IwException
ex
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
@@ -119,7 +119,7 @@ static bool ipp_Canny(const Mat& src , const Mat& dx_, const Mat& dy_, Mat& dst,
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterCanny
,
iwSrc
,
iwDst
,
low
,
high
,
::
ipp
::
IwiFilterCannyParams
(
ippFilterSobel
,
kernel
,
norm
),
ippBorderRepl
);
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
modules/imgproc/src/deriv.cpp
View file @
32a5e5fa
...
...
@@ -337,7 +337,7 @@ static bool ipp_Deriv(InputArray _src, OutputArray _dst, int dx, int dy, int ksi
if
(
useScale
)
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiScale
,
iwDstProc
,
iwDst
,
scale
,
delta
,
::
ipp
::
IwiScaleParams
(
ippAlgHintFast
));
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
@@ -765,7 +765,7 @@ static bool ipp_Laplacian(InputArray _src, OutputArray _dst, int ksize, double s
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiScale
,
iwDstProc
,
iwDst
,
scale
,
delta
);
}
catch
(
::
ipp
::
IwException
ex
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
modules/imgproc/src/morph.cpp
View file @
32a5e5fa
...
...
@@ -1299,7 +1299,7 @@ static bool ippMorph(int op, int src_type, int dst_type,
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterMorphology
,
iwSrc
,
iwDst
,
morphType
,
iwMask
,
::
ipp
::
IwDefault
(),
iwBorderType
);
}
}
catch
(
::
ipp
::
IwException
ex
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
modules/imgproc/src/resize.cpp
View file @
32a5e5fa
...
...
@@ -3241,7 +3241,7 @@ public:
::
ipp
::
IwiTile
tile
=
::
ipp
::
IwiRoi
(
0
,
range
.
start
,
m_dst
.
m_size
.
width
,
range
.
end
-
range
.
start
);
CV_INSTRUMENT_FUN_IPP
(
iwiResize
,
m_src
,
m_dst
,
ippBorderRepl
,
tile
);
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
m_ok
=
false
;
return
;
...
...
@@ -3291,7 +3291,7 @@ public:
::
ipp
::
IwiTile
tile
=
::
ipp
::
IwiRoi
(
0
,
range
.
start
,
m_dst
.
m_size
.
width
,
range
.
end
-
range
.
start
);
CV_INSTRUMENT_FUN_IPP
(
iwiWarpAffine
,
m_src
,
m_dst
,
tile
);
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
m_ok
=
false
;
return
;
...
...
@@ -3387,7 +3387,7 @@ static bool ipp_resize(const uchar * src_data, size_t src_step, int src_width, i
if
(
!
ok
)
return
false
;
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
modules/imgproc/src/smooth.cpp
View file @
32a5e5fa
...
...
@@ -1510,7 +1510,7 @@ static bool ipp_boxfilter(Mat &src, Mat &dst, Size ksize, Point anchor, bool nor
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterBox
,
iwSrc
,
iwDst
,
iwKSize
,
::
ipp
::
IwDefault
(),
ippBorder
);
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
@@ -4000,7 +4000,7 @@ public:
::
ipp
::
IwiTile
tile
=
::
ipp
::
IwiRoi
(
0
,
range
.
start
,
m_dst
.
m_size
.
width
,
range
.
end
-
range
.
start
);
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterGaussian
,
m_src
,
m_dst
,
m_kernelSize
,
m_sigma
,
::
ipp
::
IwDefault
(),
m_border
,
tile
);
}
catch
(
::
ipp
::
IwException
e
)
catch
(
const
::
ipp
::
IwException
&
)
{
*
m_pOk
=
false
;
return
;
...
...
@@ -4067,7 +4067,7 @@ static bool ipp_GaussianBlur(InputArray _src, OutputArray _dst, Size ksize,
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterGaussian
,
iwSrc
,
iwDst
,
ksize
.
width
,
sigma1
,
::
ipp
::
IwDefault
(),
ippBorder
);
}
}
catch
(
::
ipp
::
IwException
ex
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
@@ -5878,7 +5878,7 @@ public:
::
ipp
::
IwiTile
tile
=
::
ipp
::
IwiRoi
(
0
,
range
.
start
,
dst
.
m_size
.
width
,
range
.
end
-
range
.
start
);
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterBilateral
,
src
,
dst
,
radius
,
valSquareSigma
,
posSquareSigma
,
::
ipp
::
IwDefault
(),
borderType
,
tile
);
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
*
pOk
=
false
;
return
;
...
...
@@ -5933,7 +5933,7 @@ static bool ipp_bilateralFilter(Mat &src, Mat &dst, int d, double sigmaColor, do
CV_INSTRUMENT_FUN_IPP
(
::
ipp
::
iwiFilterBilateral
,
iwSrc
,
iwDst
,
radius
,
valSquareSigma
,
posSquareSigma
,
::
ipp
::
IwDefault
(),
ippBorder
);
}
}
catch
(
::
ipp
::
IwException
)
catch
(
const
::
ipp
::
IwException
&
)
{
return
false
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment