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
2b310559
Commit
2b310559
authored
Dec 03, 2013
by
Roman Donchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed the "platfrom" typo everywhere.
parent
df136339
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
arm_crosscompile_with_cmake.rst
...oduction/crosscompilation/arm_crosscompile_with_cmake.rst
+1
-1
PackageInfo.cpp
.../android/service/engine/jni/NativeService/PackageInfo.cpp
+2
-2
HardwareDetectionTest.cpp
...ndroid/service/engine/jni/Tests/HardwareDetectionTest.cpp
+1
-1
ManagerActivity.java
...engine/src/org/opencv/engine/manager/ManagerActivity.java
+7
-7
No files found.
doc/tutorials/introduction/crosscompilation/arm_crosscompile_with_cmake.rst
View file @
2b310559
...
@@ -105,7 +105,7 @@ Building OpenCV
...
@@ -105,7 +105,7 @@ Building OpenCV
Enable hardware optimizations
Enable hardware optimizations
-----------------------------
-----------------------------
Depending on target platf
ro
m architecture different instruction sets can be used. By default
Depending on target platf
or
m architecture different instruction sets can be used. By default
compiler generates code for armv5l without VFPv3 and NEON extensions. Add ``-DUSE_VFPV3=ON``
compiler generates code for armv5l without VFPv3 and NEON extensions. Add ``-DUSE_VFPV3=ON``
to cmake command line to enable code generation for VFPv3 and ``-DUSE_NEON=ON`` for using
to cmake command line to enable code generation for VFPv3 and ``-DUSE_NEON=ON`` for using
NEON SIMD extensions.
NEON SIMD extensions.
...
...
platforms/android/service/engine/jni/NativeService/PackageInfo.cpp
View file @
2b310559
...
@@ -170,7 +170,7 @@ inline string JoinPlatform(int platform)
...
@@ -170,7 +170,7 @@ inline string JoinPlatform(int platform)
return
result
;
return
result
;
}
}
inline
int
SplitPlatf
ro
m
(
const
vector
<
string
>&
features
)
inline
int
SplitPlatf
or
m
(
const
vector
<
string
>&
features
)
{
{
int
result
=
0
;
int
result
=
0
;
...
@@ -419,7 +419,7 @@ InstallPath(install_path)
...
@@ -419,7 +419,7 @@ InstallPath(install_path)
return
;
return
;
}
}
Platform
=
SplitPlatf
ro
m
(
features
);
Platform
=
SplitPlatf
or
m
(
features
);
if
(
PLATFORM_UNKNOWN
!=
Platform
)
if
(
PLATFORM_UNKNOWN
!=
Platform
)
{
{
switch
(
Platform
)
switch
(
Platform
)
...
...
platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp
View file @
2b310559
...
@@ -170,7 +170,7 @@ TEST(CpuID, CheckVFPv3)
...
@@ -170,7 +170,7 @@ TEST(CpuID, CheckVFPv3)
EXPECT_TRUE
(
cpu_id
&
FEATURES_HAS_VFPv3
);
EXPECT_TRUE
(
cpu_id
&
FEATURES_HAS_VFPv3
);
}
}
TEST
(
Platf
ro
mDetector
,
CheckTegra
)
TEST
(
Platf
or
mDetector
,
CheckTegra
)
{
{
EXPECT_NE
(
PLATFORM_UNKNOWN
,
DetectKnownPlatforms
());
EXPECT_NE
(
PLATFORM_UNKNOWN
,
DetectKnownPlatforms
());
}
}
...
...
platforms/android/service/engine/src/org/opencv/engine/manager/ManagerActivity.java
View file @
2b310559
...
@@ -90,28 +90,28 @@ public class ManagerActivity extends Activity
...
@@ -90,28 +90,28 @@ public class ManagerActivity extends Activity
mInstalledPackageView
.
setAdapter
(
mInstalledPacksAdapter
);
mInstalledPackageView
.
setAdapter
(
mInstalledPacksAdapter
);
TextView
HardwarePlatformView
=
(
TextView
)
findViewById
(
R
.
id
.
HardwareValue
);
TextView
HardwarePlatformView
=
(
TextView
)
findViewById
(
R
.
id
.
HardwareValue
);
int
Platf
ro
m
=
HardwareDetector
.
DetectKnownPlatforms
();
int
Platf
or
m
=
HardwareDetector
.
DetectKnownPlatforms
();
int
CpuId
=
HardwareDetector
.
GetCpuID
();
int
CpuId
=
HardwareDetector
.
GetCpuID
();
if
(
HardwareDetector
.
PLATFORM_UNKNOWN
!=
Platf
ro
m
)
if
(
HardwareDetector
.
PLATFORM_UNKNOWN
!=
Platf
or
m
)
{
{
if
(
HardwareDetector
.
PLATFORM_TEGRA
==
Platf
ro
m
)
if
(
HardwareDetector
.
PLATFORM_TEGRA
==
Platf
or
m
)
{
{
HardwarePlatformView
.
setText
(
"Tegra"
);
HardwarePlatformView
.
setText
(
"Tegra"
);
}
}
else
if
(
HardwareDetector
.
PLATFORM_TEGRA2
==
Platf
ro
m
)
else
if
(
HardwareDetector
.
PLATFORM_TEGRA2
==
Platf
or
m
)
{
{
HardwarePlatformView
.
setText
(
"Tegra 2"
);
HardwarePlatformView
.
setText
(
"Tegra 2"
);
}
}
else
if
(
HardwareDetector
.
PLATFORM_TEGRA3
==
Platf
ro
m
)
else
if
(
HardwareDetector
.
PLATFORM_TEGRA3
==
Platf
or
m
)
{
{
HardwarePlatformView
.
setText
(
"Tegra 3"
);
HardwarePlatformView
.
setText
(
"Tegra 3"
);
}
}
else
if
(
HardwareDetector
.
PLATFORM_TEGRA4i
==
Platf
ro
m
)
else
if
(
HardwareDetector
.
PLATFORM_TEGRA4i
==
Platf
or
m
)
{
{
HardwarePlatformView
.
setText
(
"Tegra 4i"
);
HardwarePlatformView
.
setText
(
"Tegra 4i"
);
}
}
else
if
(
HardwareDetector
.
PLATFORM_TEGRA4
==
Platf
ro
m
)
else
if
(
HardwareDetector
.
PLATFORM_TEGRA4
==
Platf
or
m
)
{
{
HardwarePlatformView
.
setText
(
"Tegra 4"
);
HardwarePlatformView
.
setText
(
"Tegra 4"
);
}
}
...
...
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