Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DaqIOLib
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
NADS-Public
DaqIOLib
Commits
56571185
Commit
56571185
authored
Apr 20, 2016
by
iowa\cschwarz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add additional check on fullSize
parent
70187f42
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
DaqFileIO.cxx
DaqFileIO.cxx
+3
-3
No files found.
DaqFileIO.cxx
View file @
56571185
...
...
@@ -2,7 +2,7 @@
///
// DAQ low level IO Library
//
// $Id: DaqFileIO.cxx,v 1.2
2 2016/04/19 20:53:03
iowa\cschwarz Exp $
// $Id: DaqFileIO.cxx,v 1.2
3 2016/04/19 21:05:50
iowa\cschwarz Exp $
// Date: March, 2005
// Author: Yiannis Papelis
//
...
...
@@ -1303,7 +1303,7 @@ CDaqLowLevelIo::LowLevelDataRead(
// The shorter storage used in the DAQ is transparent to the user so we fill
// the rest of the space (that didn't get read from the file with zeros.
int
fullSize
=
ch
.
GetRecSize
();
if
(
fullSize
!=
s
ize
)
{
if
(
fullSize
!=
size
&&
size
<
fullS
ize
)
{
memset
(((
char
*
)
pTempSpace
)
+
size
,
0
,
fullSize
-
size
);
}
daqBuf
.
Append
(
pTempSpace
,
fullSize
,
ch
.
GetItemCount
());
...
...
@@ -1967,7 +1967,7 @@ CDaqLowLevelIo::ReadChannelDataForOneFrame(
}
int
fullSize
=
ch
.
GetRecSize
();
if
(
fullSize
!=
size
)
{
if
(
fullSize
!=
size
&&
size
<
fullSize
)
{
memset
(((
char
*
)
pTempSpace
)
+
size
,
0
,
fullSize
-
size
);
}
daqBuf
.
Replace
(
pTempSpace
,
fullSize
,
ch
.
GetItemCount
());
...
...
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