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
0c5faa6d
Commit
0c5faa6d
authored
Mar 17, 2015
by
Dmitry-Me
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix uninitialized members, fix log output typo
parent
e12a04ac
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
camera_wrapper.cpp
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+4
-2
No files found.
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
View file @
0c5faa6d
...
...
@@ -314,7 +314,9 @@ public:
cameraId
(
0
),
cameraCallback
(
callback
),
userData
(
_userData
),
emptyCameraCallbackReported
(
0
)
emptyCameraCallbackReported
(
0
),
width
(),
height
()
{
LOGD
(
"Instantiated new CameraHandler (%p, %p)"
,
callback
,
_userData
);
void
*
params_buffer
=
operator
new
(
sizeof
(
CameraParameters
)
+
MAGIC_TAIL
);
...
...
@@ -1122,7 +1124,7 @@ void CameraHandler::applyProperties(CameraHandler** ppcameraHandler)
if
(
handler
==
NULL
)
{
LOGE
(
"ERROR in applyProperties --- cannot reinit camera"
);
handler
=
initCameraConnect
(
cameraCallback
,
cameraId
,
userData
,
NULL
);
LOGD
(
"CameraHandler::applyProperties(): repeat
e
initCameraConnect after ERROR, handler=0x%x"
,
(
int
)
handler
);
LOGD
(
"CameraHandler::applyProperties(): repeat initCameraConnect after ERROR, handler=0x%x"
,
(
int
)
handler
);
if
(
handler
==
NULL
)
{
LOGE
(
"ERROR in applyProperties --- cannot reinit camera AGAIN --- cannot do anything else"
);
}
...
...
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