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
2cd1c496
Commit
2cd1c496
authored
Jul 17, 2013
by
Roman Donchenko
Committed by
OpenCV Buildbot
Jul 17, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1126 from asmorkalov:winrt
parents
77fe7f47
16cfc7a5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
ba.cpp
modules/contrib/src/ba.cpp
+1
-1
histogram.cpp
modules/imgproc/src/histogram.cpp
+6
-0
No files found.
modules/contrib/src/ba.cpp
View file @
2cd1c496
...
@@ -744,7 +744,7 @@ static void fjac(int /*i*/, int /*j*/, CvMat *point_params, CvMat* cam_params, C
...
@@ -744,7 +744,7 @@ static void fjac(int /*i*/, int /*j*/, CvMat *point_params, CvMat* cam_params, C
CvMat
*
_mp
=
cvCreateMat
(
1
,
1
,
CV_64FC2
);
//projection of the point
CvMat
*
_mp
=
cvCreateMat
(
1
,
1
,
CV_64FC2
);
//projection of the point
//split camera params into different matrices
//split camera params into different matrices
CvMat
_ri
,
_ti
,
_k
;
CvMat
_ri
,
_ti
,
_k
=
cvMat
(
0
,
0
,
CV_64F
,
NULL
);
// dummy initialization to fix warning of cl.exe
cvGetRows
(
cam_params
,
&
_ri
,
0
,
3
);
cvGetRows
(
cam_params
,
&
_ri
,
0
,
3
);
cvGetRows
(
cam_params
,
&
_ti
,
3
,
6
);
cvGetRows
(
cam_params
,
&
_ti
,
3
,
6
);
...
...
modules/imgproc/src/histogram.cpp
View file @
2cd1c496
...
@@ -270,6 +270,8 @@ public:
...
@@ -270,6 +270,8 @@ public:
}
}
private
:
private
:
calcHist1D_Invoker
operator
=
(
const
calcHist1D_Invoker
&
);
T
*
p_
[
one
];
T
*
p_
[
one
];
uchar
*
mask_
;
uchar
*
mask_
;
int
step_
[
one
];
int
step_
[
one
];
...
@@ -342,6 +344,8 @@ public:
...
@@ -342,6 +344,8 @@ public:
}
}
private
:
private
:
calcHist2D_Invoker
operator
=
(
const
calcHist2D_Invoker
&
);
T
*
p_
[
two
];
T
*
p_
[
two
];
uchar
*
mask_
;
uchar
*
mask_
;
int
step_
[
two
];
int
step_
[
two
];
...
@@ -432,6 +436,8 @@ public:
...
@@ -432,6 +436,8 @@ public:
}
}
private
:
private
:
calcHist3D_Invoker
operator
=
(
const
calcHist3D_Invoker
&
);
T
*
p_
[
three
];
T
*
p_
[
three
];
uchar
*
mask_
;
uchar
*
mask_
;
int
step_
[
three
];
int
step_
[
three
];
...
...
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