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
73aa43d2
Commit
73aa43d2
authored
Dec 06, 2013
by
Ilya Lavrenov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed warnings
parent
d368bf52
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
sumpixels.cpp
modules/imgproc/src/sumpixels.cpp
+5
-6
contrast_preserve.hpp
modules/photo/src/contrast_preserve.hpp
+1
-1
No files found.
modules/imgproc/src/sumpixels.cpp
View file @
73aa43d2
...
...
@@ -250,9 +250,9 @@ static bool ocl_integral( InputArray _src, OutputArray _sum, int sdepth )
UMat
src
=
_src
.
getUMat
(),
t_sum
(
t_size
,
sdepth
),
sum
=
_sum
.
getUMat
();
t_sum
=
t_sum
(
Range
::
all
(),
Range
(
0
,
size
.
height
));
int
offset
=
src
.
offset
/
vlen
,
pre_invalid
=
src
.
offset
%
vlen
;
int
offset
=
(
int
)
src
.
offset
/
vlen
,
pre_invalid
=
(
int
)
src
.
offset
%
vlen
;
int
vcols
=
(
pre_invalid
+
src
.
cols
+
vlen
-
1
)
/
vlen
;
int
sum_offset
=
sum
.
offset
/
vlen
;
int
sum_offset
=
(
int
)
sum
.
offset
/
vlen
;
k1
.
args
(
ocl
::
KernelArg
::
PtrReadOnly
(
src
),
ocl
::
KernelArg
::
PtrWriteOnly
(
t_sum
),
offset
,
pre_invalid
,
src
.
rows
,
src
.
cols
,
(
int
)
src
.
step
,
(
int
)
t_sum
.
step
);
...
...
@@ -297,12 +297,11 @@ static bool ocl_integral( InputArray _src, OutputArray _sum, OutputArray _sqsum,
_sqsum
.
create
(
dsize
,
sqdepth
);
UMat
sum
=
_sum
.
getUMat
(),
sqsum
=
_sqsum
.
getUMat
();
int
offset
=
src
.
offset
/
vlen
;
int
offset
=
(
int
)
src
.
offset
/
vlen
;
int
pre_invalid
=
src
.
offset
%
vlen
;
int
vcols
=
(
pre_invalid
+
src
.
cols
+
vlen
-
1
)
/
vlen
;
int
sum_offset
=
sum
.
offset
/
sum
.
elemSize
();
int
sqsum_offset
=
sqsum
.
offset
/
sqsum
.
elemSize
();
CV_Assert
(
sqsum
.
offset
%
sqsum
.
elemSize
()
==
0
);
int
sum_offset
=
(
int
)(
sum
.
offset
/
sum
.
elemSize
());
int
sqsum_offset
=
(
int
)(
sqsum
.
offset
/
sqsum
.
elemSize
());
k1
.
args
(
ocl
::
KernelArg
::
PtrReadOnly
(
src
),
ocl
::
KernelArg
::
PtrWriteOnly
(
t_sum
),
ocl
::
KernelArg
::
PtrWriteOnly
(
t_sqsum
),
offset
,
pre_invalid
,
src
.
rows
,
...
...
modules/photo/src/contrast_preserve.hpp
View file @
73aa43d2
...
...
@@ -355,7 +355,7 @@ void Decolor::wei_update_matrix(vector < vector <double> > &poly, vector <double
Mat
B
=
Mat
(
size
,
size0
,
CV_32FC1
);
for
(
int
i
=
0
;
i
<
size
;
i
++
)
{
for
(
int
j
=
0
,
end
=
Cg
.
size
();
j
<
end
;
j
++
)
for
(
int
j
=
0
,
end
=
(
int
)
Cg
.
size
();
j
<
end
;
j
++
)
B
.
at
<
float
>
(
i
,
j
)
=
(
float
)
(
poly
[
i
][
j
]
*
Cg
[
j
]);
}
...
...
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