rpms/pfstools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
b8b56048bd
pfstools/pfstools-octave4.patch
Orion Poplawski b8b56048bd Initial attempt at 2.0.3
2015-07-07 11:19:19 -06:00

200 lines
8.7 KiB
Diff
Raw Blame History

diff -up pfstools-2.0.3/src/octave/pfsclose.cpp.octave4 pfstools-2.0.3/src/octave/pfsclose.cpp
--- pfstools-2.0.3/src/octave/pfsclose.cpp.octave4 2015-04-28 09:50:54.000000000 -0600
+++ pfstools-2.0.3/src/octave/pfsclose.cpp 2015-07-07 10:33:42.020303959 -0600
@@ -53,9 +53,9 @@ DEFUN_DLD( pfsclose, args, , helpString
return retval;
}
- Octave_map pfsStream = args(0).map_value();
+ octave_map pfsStream = args(0).map_value();
- Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
if( itFH == pfsStream.end() ||
!pfsStream.contents( itFH )(0).is_real_scalar() )
{
diff -up pfstools-2.0.3/src/octave/pfsget.cpp.octave4 pfstools-2.0.3/src/octave/pfsget.cpp
--- pfstools-2.0.3/src/octave/pfsget.cpp.octave4 2015-04-28 09:50:54.000000000 -0600
+++ pfstools-2.0.3/src/octave/pfsget.cpp 2015-07-07 10:56:34.752852324 -0600
@@ -52,9 +52,9 @@ DEFUN_DLD( pfsget, args, , helpString)
return retval;
}
- Octave_map pfsStream = args(0).map_value();
+ octave_map pfsStream = args(0).map_value();
- Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
if( itFH == pfsStream.end() ||
!pfsStream.contents( itFH )(0).is_real_scalar() )
{
@@ -63,7 +63,7 @@ DEFUN_DLD( pfsget, args, , helpString)
}
FILE *fh = (FILE*)((long)(pfsStream.contents( itFH )(0).double_value()));
- Octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
+ octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() )
{
error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
@@ -95,7 +95,7 @@ DEFUN_DLD( pfsget, args, , helpString)
// Add channels as matrices to pfs stream struct
{
- Octave_map channels;
+ octave_map channels;
pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );
while( cit->hasNext() ) {
@@ -115,7 +115,7 @@ DEFUN_DLD( pfsget, args, , helpString)
//Add tags
{
- Octave_map tags;
+ octave_map tags;
pfs::TagIteratorPtr it( frame->getTags()->getIterator() );
while( it->hasNext() ) {
@@ -124,14 +124,14 @@ DEFUN_DLD( pfsget, args, , helpString)
}
pfsStream.assign( "tags", tags );
- Octave_map channelTagList;
+ octave_map channelTagList;
//Copy all channel tags
pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );
while( cit->hasNext() ) {
pfs::Channel *ch = cit->getNext();
- Octave_map channelTags;
+ octave_map channelTags;
pfs::TagIteratorPtr tit( ch->getTags()->getIterator() );
while( tit->hasNext() ) {
diff -up pfstools-2.0.3/src/octave/pfsopen.cpp.octave4 pfstools-2.0.3/src/octave/pfsopen.cpp
--- pfstools-2.0.3/src/octave/pfsopen.cpp.octave4 2015-04-28 09:50:54.000000000 -0600
+++ pfstools-2.0.3/src/octave/pfsopen.cpp 2015-07-07 10:57:06.345705516 -0600
@@ -137,7 +137,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
}
}
- Octave_map pfsStream;
+ octave_map pfsStream;
pfsStream.assign( "FH", octave_value((double)((long)fh)) );
pfsStream.assign( "MODE", writeMode ? octave_value("W") : octave_value("R") );
pfsStream.assign( "EOF", octave_value(false) );
@@ -145,7 +145,7 @@ DEFUN_DLD( pfsopen, args, , helpString)
if( writeMode ) {
pfsStream.assign( "columns", octave_value(width) );
pfsStream.assign( "rows", octave_value(height) );
- Octave_map channels;
+ octave_map channels;
pfsStream.assign( "channels", octave_value(channels) );
}
diff -up pfstools-2.0.3/src/octave/pfsput.cpp.octave4 pfstools-2.0.3/src/octave/pfsput.cpp
--- pfstools-2.0.3/src/octave/pfsput.cpp.octave4 2015-04-28 09:50:54.000000000 -0600
+++ pfstools-2.0.3/src/octave/pfsput.cpp 2015-07-07 10:56:05.153989866 -0600
@@ -52,9 +52,9 @@ DEFUN_DLD( pfsput, args, , helpString)
return retval;
}
- Octave_map pfsStream = args(0).map_value();
+ octave_map pfsStream = args(0).map_value();
- Octave_map::const_iterator itFH = pfsStream.seek( "FH" );
+ octave_map::const_iterator itFH = pfsStream.seek( "FH" );
if( itFH == pfsStream.end() ||
!pfsStream.contents( itFH )(0).is_real_scalar() )
{
@@ -65,7 +65,7 @@ DEFUN_DLD( pfsput, args, , helpString)
// Check mode
{
- Octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
+ octave_map::const_iterator itMode = pfsStream.seek( "MODE" );
if( itMode == pfsStream.end() || !pfsStream.contents( itMode )(0).is_string() )
{
error( SCRIPT_NAME ": MODE field missing in the structure or it has wrong type");
@@ -80,8 +80,8 @@ DEFUN_DLD( pfsput, args, , helpString)
// Get width & height
int width, height;
{
- Octave_map::const_iterator itCols = pfsStream.seek( "columns" );
- Octave_map::const_iterator itRows = pfsStream.seek( "rows" );
+ octave_map::const_iterator itCols = pfsStream.seek( "columns" );
+ octave_map::const_iterator itRows = pfsStream.seek( "rows" );
if( itCols == pfsStream.end() || itRows == pfsStream.end() ||
!pfsStream.contents( itCols )(0).is_real_scalar() ||
!pfsStream.contents( itRows )(0).is_real_scalar() )
@@ -94,9 +94,9 @@ DEFUN_DLD( pfsput, args, , helpString)
}
// Get channels
- Octave_map channels;
+ octave_map channels;
{
- Octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
+ octave_map::const_iterator itChannels = pfsStream.seek( "channels" );
if( itChannels == pfsStream.end() ||
!pfsStream.contents( itChannels )(0).is_map() )
{
@@ -111,7 +111,7 @@ DEFUN_DLD( pfsput, args, , helpString)
pfs::Frame *frame = ctx.createFrame( width, height );
// For each channel in the 'channels' map
- for( Octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
+ for( octave_map::iterator itCh = channels.begin(); itCh != channels.end(); itCh++ ) {
std::string channelName = channels.key(itCh);
if( !channels.contents( itCh )(0).is_real_matrix() ) {
@@ -135,15 +135,15 @@ DEFUN_DLD( pfsput, args, , helpString)
// Copy frame tags
{
- Octave_map::const_iterator itTags = pfsStream.seek( "tags" );
+ octave_map::const_iterator itTags = pfsStream.seek( "tags" );
if( itTags != pfsStream.end() ) {
if( !pfsStream.contents( itTags )(0).is_map() )
{
throw pfs::Exception( "'tags' field must be a structure" );
}
- Octave_map tags = pfsStream.contents( itTags )(0).map_value();
- for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
+ octave_map tags = pfsStream.contents( itTags )(0).map_value();
+ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
std::string tagName = tags.key(itTag);
if( !tags.contents( itTag )(0).is_string() )
@@ -156,14 +156,14 @@ DEFUN_DLD( pfsput, args, , helpString)
// Copy channel tags
{
- Octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
+ octave_map::const_iterator itChTags = pfsStream.seek( "channelTags" );
if( itChTags != pfsStream.end() ) {
if( !pfsStream.contents( itChTags )(0).is_map() )
{
throw pfs::Exception( "'channelTags' field must be a structure" );
}
- Octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
- for( Octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
+ octave_map tagChannels = pfsStream.contents( itChTags )(0).map_value();
+ for( octave_map::iterator itCh = tagChannels.begin(); itCh != tagChannels.end(); itCh++ ) {
std::string channelName = tagChannels.key(itCh);
if( !tagChannels.contents( itCh )(0).is_map() ) {
throw pfs::Exception( "each channelTags file must be a structure" );
@@ -173,8 +173,8 @@ DEFUN_DLD( pfsput, args, , helpString)
throw pfs::Exception( "can not set channel tag if channel is missing" );
}
- Octave_map tags = tagChannels.contents( itCh )(0).map_value();
- for( Octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
+ octave_map tags = tagChannels.contents( itCh )(0).map_value();
+ for( octave_map::iterator itTag = tags.begin(); itTag != tags.end(); itTag++ ) {
std::string tagName = tags.key(itTag);
if( !tags.contents( itTag )(0).is_string() )
throw pfs::Exception( "all channel tags must be given as strings" );
Reference in New Issue View Git Blame Copy Permalink