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
eca5906a
Commit
eca5906a
authored
Oct 02, 2017
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9746 from alalek:fix_msvs2017_warning
parents
b872d143
1f18282f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
4 deletions
+14
-4
fisheye.cpp
modules/calib3d/src/fisheye.cpp
+1
-1
command_line_parser.cpp
modules/core/src/command_line_parser.cpp
+6
-1
ocl.cpp
modules/core/src/ocl.cpp
+6
-1
exposure_compensate.cpp
modules/stitching/src/exposure_compensate.cpp
+1
-1
No files found.
modules/calib3d/src/fisheye.cpp
View file @
eca5906a
...
...
@@ -928,7 +928,7 @@ double cv::fisheye::stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayO
intrinsicRight_errors
.
isEstimate
=
intrinsicRight
.
isEstimate
;
std
::
vector
<
uchar
>
selectedParams
;
std
::
vector
<
int
>
tmp
(
6
*
(
n_images
+
1
),
1
);
std
::
vector
<
uchar
>
tmp
(
6
*
(
n_images
+
1
),
1
);
selectedParams
.
insert
(
selectedParams
.
end
(),
intrinsicLeft
.
isEstimate
.
begin
(),
intrinsicLeft
.
isEstimate
.
end
());
selectedParams
.
insert
(
selectedParams
.
end
(),
intrinsicRight
.
isEstimate
.
begin
(),
intrinsicRight
.
isEstimate
.
end
());
selectedParams
.
insert
(
selectedParams
.
end
(),
tmp
.
begin
(),
tmp
.
end
());
...
...
modules/core/src/command_line_parser.cpp
View file @
eca5906a
...
...
@@ -69,9 +69,14 @@ static const char* get_type_name(int type)
return
"unknown"
;
}
// std::tolower is int->int
static
char
char_tolower
(
char
ch
)
{
return
(
char
)
std
::
tolower
((
int
)
ch
);
}
static
bool
parse_bool
(
std
::
string
str
)
{
std
::
transform
(
str
.
begin
(),
str
.
end
(),
str
.
begin
(),
::
tolower
);
std
::
transform
(
str
.
begin
(),
str
.
end
(),
str
.
begin
(),
char_
tolower
);
std
::
istringstream
is
(
str
);
bool
b
;
is
>>
(
str
.
size
()
>
1
?
std
::
boolalpha
:
std
::
noboolalpha
)
>>
b
;
...
...
modules/core/src/ocl.cpp
View file @
eca5906a
...
...
@@ -993,6 +993,11 @@ static cl_device_id selectOpenCLDevice()
return
NULL
;
}
#else
// std::tolower is int->int
static
char
char_tolower
(
char
ch
)
{
return
(
char
)
std
::
tolower
((
int
)
ch
);
}
static
cl_device_id
selectOpenCLDevice
()
{
std
::
string
platform
,
deviceName
;
...
...
@@ -1077,7 +1082,7 @@ static cl_device_id selectOpenCLDevice()
{
int
deviceType
=
0
;
std
::
string
tempStrDeviceType
=
deviceTypes
[
t
];
std
::
transform
(
tempStrDeviceType
.
begin
(),
tempStrDeviceType
.
end
(),
tempStrDeviceType
.
begin
(),
tolower
);
std
::
transform
(
tempStrDeviceType
.
begin
(),
tempStrDeviceType
.
end
(),
tempStrDeviceType
.
begin
(),
char_tolower
);
if
(
tempStrDeviceType
==
"gpu"
||
tempStrDeviceType
==
"dgpu"
||
tempStrDeviceType
==
"igpu"
)
deviceType
=
Device
::
TYPE_GPU
;
...
...
modules/stitching/src/exposure_compensate.cpp
View file @
eca5906a
...
...
@@ -63,7 +63,7 @@ void ExposureCompensator::feed(const std::vector<Point> &corners, const std::vec
{
std
::
vector
<
std
::
pair
<
UMat
,
uchar
>
>
level_masks
;
for
(
size_t
i
=
0
;
i
<
masks
.
size
();
++
i
)
level_masks
.
push_back
(
std
::
make_pair
(
masks
[
i
],
255
));
level_masks
.
push_back
(
std
::
make_pair
(
masks
[
i
],
(
uchar
)
255
));
feed
(
corners
,
images
,
level_masks
);
}
...
...
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