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
6ef0253f
Commit
6ef0253f
authored
Dec 26, 2013
by
Alexander Karsakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disabled some IPP implementation since it breaks tests
parent
1e27b07e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
canny.cpp
modules/imgproc/src/canny.cpp
+2
-1
color.cpp
modules/imgproc/src/color.cpp
+2
-2
imgwarp.cpp
modules/imgproc/src/imgwarp.cpp
+6
-6
haar.cpp
modules/objdetect/src/haar.cpp
+2
-2
No files found.
modules/imgproc/src/canny.cpp
View file @
6ef0253f
...
...
@@ -41,12 +41,13 @@
#include "precomp.hpp"
/*
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
#define USE_IPP_CANNY 1
#else
#undef USE_IPP_CANNY
#endif
*/
#ifdef USE_IPP_CANNY
namespace
cv
{
...
...
modules/imgproc/src/color.cpp
View file @
6ef0253f
...
...
@@ -3737,7 +3737,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
CV_Assert
(
scn
==
3
||
scn
==
4
);
_dst
.
create
(
sz
,
CV_MAKETYPE
(
depth
,
1
));
dst
=
_dst
.
getMat
();
/*
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
if( code == CV_BGR2GRAY )
{
...
...
@@ -3760,7 +3760,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
return;
}
#endif
*/
bidx
=
code
==
CV_BGR2GRAY
||
code
==
CV_BGRA2GRAY
?
0
:
2
;
if
(
depth
==
CV_8U
)
...
...
modules/imgproc/src/imgwarp.cpp
View file @
6ef0253f
...
...
@@ -1846,7 +1846,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
int
depth
=
src
.
depth
(),
cn
=
src
.
channels
();
double
scale_x
=
1.
/
inv_scale_x
,
scale_y
=
1.
/
inv_scale_y
;
int
k
,
sx
,
sy
,
dx
,
dy
;
/*
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
int mode = interpolation == INTER_LINEAR ? IPPI_INTER_LINEAR : 0;
int type = src.type();
...
...
@@ -1874,7 +1874,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
return;
}
#endif
*/
if
(
interpolation
==
INTER_NEAREST
)
{
resizeNN
(
src
,
dst
,
inv_scale_x
,
inv_scale_y
);
...
...
@@ -3477,7 +3477,7 @@ void cv::warpAffine( InputArray _src, OutputArray _dst,
int
*
adelta
=
&
_abdelta
[
0
],
*
bdelta
=
adelta
+
dst
.
cols
;
const
int
AB_BITS
=
MAX
(
10
,
(
int
)
INTER_BITS
);
const
int
AB_SCALE
=
1
<<
AB_BITS
;
/*
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
int depth = src.depth();
int channels = src.channels();
...
...
@@ -3521,7 +3521,7 @@ void cv::warpAffine( InputArray _src, OutputArray _dst,
}
}
#endif
*/
for
(
x
=
0
;
x
<
dst
.
cols
;
x
++
)
{
adelta
[
x
]
=
saturate_cast
<
int
>
(
M
[
0
]
*
x
*
AB_SCALE
);
...
...
@@ -3702,7 +3702,7 @@ void cv::warpPerspective( InputArray _src, OutputArray _dst, InputArray _M0,
if
(
!
(
flags
&
WARP_INVERSE_MAP
)
)
invert
(
matM
,
matM
);
/*
#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR >= 7)
int depth = src.depth();
int channels = src.channels();
...
...
@@ -3746,7 +3746,7 @@ void cv::warpPerspective( InputArray _src, OutputArray _dst, InputArray _M0,
}
}
#endif
*/
Range
range
(
0
,
dst
.
rows
);
warpPerspectiveInvoker
invoker
(
src
,
dst
,
M
,
interpolation
,
borderType
,
borderValue
);
parallel_for_
(
range
,
invoker
,
dst
.
total
()
/
(
double
)(
1
<<
16
));
...
...
modules/objdetect/src/haar.cpp
View file @
6ef0253f
...
...
@@ -335,7 +335,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
out
->
isStumpBased
&=
node_count
==
1
;
}
}
/*
#ifdef HAVE_IPP
int can_use_ipp = !out->has_tilted_features && !out->is_tree && out->isStumpBased;
...
...
@@ -391,7 +391,7 @@ icvCreateHidHaarClassifierCascade( CvHaarClassifierCascade* cascade )
}
}
#endif
*/
cascade
->
hid_cascade
=
out
;
assert
(
(
char
*
)
haar_node_ptr
-
(
char
*
)
out
<=
datasize
);
...
...
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