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
8bcec7d7
Commit
8bcec7d7
authored
Aug 12, 2016
by
Pavel Vlasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IPP enabling fix and typo fix;
parent
f210602d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
system.cpp
modules/core/src/system.cpp
+13
-13
No files found.
modules/core/src/system.cpp
View file @
8bcec7d7
...
@@ -1303,10 +1303,10 @@ void setUseCollection(bool flag)
...
@@ -1303,10 +1303,10 @@ void setUseCollection(bool flag)
namespace
ipp
namespace
ipp
{
{
struct
IPPInitSing
el
ton
struct
IPPInitSing
le
ton
{
{
public
:
public
:
IPPInitSing
el
ton
()
IPPInitSing
le
ton
()
{
{
useIPP
=
true
;
useIPP
=
true
;
ippStatus
=
0
;
ippStatus
=
0
;
...
@@ -1360,15 +1360,15 @@ public:
...
@@ -1360,15 +1360,15 @@ public:
int
ippFeatures
;
int
ippFeatures
;
};
};
static
IPPInitSing
elton
&
getIPPSingel
ton
()
static
IPPInitSing
leton
&
getIPPSingle
ton
()
{
{
CV_SINGLETON_LAZY_INIT_REF
(
IPPInitSing
elton
,
new
IPPInitSingel
ton
())
CV_SINGLETON_LAZY_INIT_REF
(
IPPInitSing
leton
,
new
IPPInitSingle
ton
())
}
}
int
getIppFeatures
()
int
getIppFeatures
()
{
{
#ifdef HAVE_IPP
#ifdef HAVE_IPP
return
getIPPSing
el
ton
().
ippFeatures
;
return
getIPPSing
le
ton
().
ippFeatures
;
#else
#else
return
0
;
return
0
;
#endif
#endif
...
@@ -1376,20 +1376,20 @@ int getIppFeatures()
...
@@ -1376,20 +1376,20 @@ int getIppFeatures()
void
setIppStatus
(
int
status
,
const
char
*
const
_funcname
,
const
char
*
const
_filename
,
int
_line
)
void
setIppStatus
(
int
status
,
const
char
*
const
_funcname
,
const
char
*
const
_filename
,
int
_line
)
{
{
getIPPSing
el
ton
().
ippStatus
=
status
;
getIPPSing
le
ton
().
ippStatus
=
status
;
getIPPSing
el
ton
().
funcname
=
_funcname
;
getIPPSing
le
ton
().
funcname
=
_funcname
;
getIPPSing
el
ton
().
filename
=
_filename
;
getIPPSing
le
ton
().
filename
=
_filename
;
getIPPSing
el
ton
().
linen
=
_line
;
getIPPSing
le
ton
().
linen
=
_line
;
}
}
int
getIppStatus
()
int
getIppStatus
()
{
{
return
getIPPSing
el
ton
().
ippStatus
;
return
getIPPSing
le
ton
().
ippStatus
;
}
}
String
getIppErrorLocation
()
String
getIppErrorLocation
()
{
{
return
format
(
"%s:%d %s"
,
getIPPSing
elton
().
filename
?
getIPPSingelton
().
filename
:
""
,
getIPPSingelton
().
linen
,
getIPPSingelton
().
funcname
?
getIPPSingel
ton
().
funcname
:
""
);
return
format
(
"%s:%d %s"
,
getIPPSing
leton
().
filename
?
getIPPSingleton
().
filename
:
""
,
getIPPSingleton
().
linen
,
getIPPSingleton
().
funcname
?
getIPPSingle
ton
().
funcname
:
""
);
}
}
bool
useIPP
()
bool
useIPP
()
...
@@ -1398,7 +1398,7 @@ bool useIPP()
...
@@ -1398,7 +1398,7 @@ bool useIPP()
CoreTLSData
*
data
=
getCoreTlsData
().
get
();
CoreTLSData
*
data
=
getCoreTlsData
().
get
();
if
(
data
->
useIPP
<
0
)
if
(
data
->
useIPP
<
0
)
{
{
data
->
useIPP
=
getIPPSing
el
ton
().
useIPP
;
data
->
useIPP
=
getIPPSing
le
ton
().
useIPP
;
}
}
return
(
data
->
useIPP
>
0
);
return
(
data
->
useIPP
>
0
);
#else
#else
...
@@ -1410,7 +1410,7 @@ void setUseIPP(bool flag)
...
@@ -1410,7 +1410,7 @@ void setUseIPP(bool flag)
{
{
CoreTLSData
*
data
=
getCoreTlsData
().
get
();
CoreTLSData
*
data
=
getCoreTlsData
().
get
();
#ifdef HAVE_IPP
#ifdef HAVE_IPP
data
->
useIPP
=
flag
;
data
->
useIPP
=
(
getIPPSingleton
().
useIPP
)
?
flag
:
false
;
#else
#else
(
void
)
flag
;
(
void
)
flag
;
data
->
useIPP
=
false
;
data
->
useIPP
=
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