Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-pco
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-pco
Commits
962c2098
Commit
962c2098
authored
Apr 12, 2019
by
Roberto Arturo Homs-Regojo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[wip] cosmetics / warning
parent
2a322d60
Pipeline
#10280
failed with stages
in 1 minute and 51 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
20 deletions
+17
-20
src/PcoCameraSdk.cpp
src/PcoCameraSdk.cpp
+1
-4
src/PcoCameraUtils.cpp
src/PcoCameraUtils.cpp
+16
-16
No files found.
src/PcoCameraSdk.cpp
View file @
962c2098
...
...
@@ -3418,12 +3418,9 @@ void Camera::_pco_ResetLib(int &err)
err
=
0
;
#ifdef __linux__
DEB_ALWAYS
()
<<
"
NOT IMPLEMENTED IN LINUX
"
;
DEB_ALWAYS
()
<<
"
INFO: function does NOT exists in linux ["
<<
fnId
<<
"]
"
;
return
;
#else
err
=
PCO_ResetLib
();
PCO_CHECK_ERROR
(
err
,
fnId
);
...
...
src/PcoCameraUtils.cpp
View file @
962c2098
...
...
@@ -107,24 +107,24 @@ char *getTimestamp(timestampFmt fmtIdx, time_t xtime) {
st
.
wHour
,
st
.
wMinute
,
st
.
wSecond
,
st
.
wMilliseconds
);
#else
struct
timespec
tickNow
=
{
0
,
0
};
time_t
timeRaw
;
struct
tm
*
timeInfo
;
clock_gettime
(
CLOCK_REALTIME
,
&
tickNow
);
time_t
rawtime
;
struct
tm
*
timeinfo
;
time
(
&
rawtime
);
timeinfo
=
localtime
(
&
rawtime
);
__sprintfSExt
(
timeline
,
sizeof
(
timeline
),
"%4d/%02d/%02d %02d:%02d:%02d.%03d"
,
timeinfo
->
tm_year
+
1900
,
timeinfo
->
tm_mon
+
1
,
timeinfo
->
tm_mday
,
timeinfo
->
tm_hour
,
timeinfo
->
tm_min
,
timeinfo
->
tm_sec
,
(
int
)(
tickNow
.
tv_nsec
/
1000000
)
time
(
&
timeRaw
);
timeInfo
=
localtime
(
&
timeRaw
);
__sprintfSExt
(
timeline
,
sizeof
(
timeline
),
"%4d/%02d/%02d %02d:%02d:%02d.%03d"
,
timeInfo
->
tm_year
+
1900
,
timeInfo
->
tm_mon
+
1
,
timeInfo
->
tm_mday
,
timeInfo
->
tm_hour
,
timeInfo
->
tm_min
,
timeInfo
->
tm_sec
,
int
((
tickNow
.
tv_nsec
/
1000000
))
);
// __sprintfSExt(timeline, sizeof(timeline),"getTimestamp IsoMilliSec: LINUX - not defined");
#endif
return
timeline
;
}
...
...
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