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
7d210699
Commit
7d210699
authored
Jun 20, 2011
by
iowa\dheitbri
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added check to make sure we are not trying to grab more data than we have space for.
parent
d8b41d9b
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
DaqFileIO.cxx
DaqFileIO.cxx
+6
-3
No files found.
DaqFileIO.cxx
View file @
7d210699
...
...
@@ -2,7 +2,7 @@
///
// DAQ low level IO Library
//
// $Id: DaqFileIO.cxx,v 1.1
5 2010/05/03 17:25:45
iowa\dheitbri Exp $
// $Id: DaqFileIO.cxx,v 1.1
6 2011/06/20 14:36:30
iowa\dheitbri Exp $
// Date: March, 2005
// Author: Yiannis Papelis
//
...
...
@@ -206,7 +206,7 @@ CDaqLowLevelIo::FrameDropped(int frm)
}
int
CDaqLowLevelIo
::
GetDroppedFrames
()
const
{
return
m_DroppedFrames
.
size
();
return
(
int
)
m_DroppedFrames
.
size
();
}
/////////////////////////////////////////////////////////////////////////////
///
...
...
@@ -1878,7 +1878,10 @@ CDaqLowLevelIo::ReadDataForOneFrame(
}
int
fullSize
=
ch
.
GetRecSize
();
if
(
fullSize
!=
size
)
{
if
(
size
<
fullSize
){
size
=
fullSize
;
}
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