--- src/octave/pfsclose.cpp.orig	2016-01-12 13:32:11.031123026 +0000

+++ src/octave/pfsclose.cpp	2016-01-12 13:32:11.061123988 +0000

@@ -53,9 +53,9 @@

     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() )

   {

--- src/octave/pfsget.cpp.orig	2016-01-12 13:32:11.031123026 +0000

+++ src/octave/pfsget.cpp	2016-01-12 13:32:11.061123988 +0000

@@ -52,9 +52,9 @@

     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 @@

   }  

   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 @@

       // Add channels as matrices to pfs stream struct

       {

-        Octave_map channels;

+        octave_scalar_map channels;

         pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );

         while( cit->hasNext() ) {

@@ -115,7 +115,7 @@

       //Add tags

       {

-        Octave_map tags;

+        octave_scalar_map tags;

         pfs::TagIteratorPtr it( frame->getTags()->getIterator() );        

         while( it->hasNext() ) {

@@ -124,14 +124,14 @@

         }

         pfsStream.assign( "tags", tags );

-        Octave_map channelTagList;

+        octave_scalar_map channelTagList;

         //Copy all channel tags

         pfs::ChannelIteratorPtr cit( frame->getChannelIterator() );

         while( cit->hasNext() ) {

           pfs::Channel *ch = cit->getNext();

-          Octave_map channelTags;

+          octave_scalar_map channelTags;

           pfs::TagIteratorPtr tit( ch->getTags()->getIterator() );        

           while( tit->hasNext() ) {

--- src/octave/pfsopen.cpp.orig	2016-01-12 13:32:11.031123026 +0000

+++ src/octave/pfsopen.cpp	2016-01-12 13:32:11.061123988 +0000

@@ -137,7 +137,7 @@

     }    

   }

-  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 @@

   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) );    

   }

--- src/octave/pfsput.cpp.orig	2016-01-12 13:32:11.031123026 +0000

+++ src/octave/pfsput.cpp	2016-01-12 13:32:11.061123988 +0000

@@ -52,9 +52,9 @@

     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 @@

   // 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 @@

   // 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 @@

   }

   // 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 @@

     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 @@

     // 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 @@

     // 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 @@

             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" );

@dirrm include/pfs-1.2

%%IMAGEMAGICK%%@dirrm %%DATADIR%%/hdrhtml_hdrlabs_templ/hdrhtml_assets

%%IMAGEMAGICK%%@dirrm %%DATADIR%%/hdrhtml_hdrlabs_templ

%%IMAGEMAGICK%%@dirrm %%DATADIR%%/hdrhtml_default_templ

%%IMAGEMAGICK%%@dirrm %%DATADIR%%

%%OCTAVE%%@cwd %%OCTAVE_BASE%%

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsclose.oct

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsget.oct

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsopen.oct

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsput.oct

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfsread.oct

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfstransform_colorspace.oct

%%OCTAVE%%%%OCTAVE_SITE_OCT%%/pfstools/pfswrite.oct

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_close_frames.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_open_frames.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_read_luminance.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_read_rgb.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_read_xyz.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfs_write_rgb.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfssize.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfsview.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfsview_list.m

%%OCTAVE%%%%OCTAVE_SITE_M%%/pfstools/pfsview_rgb.m

%%OCTAVE%%@dirrm %%OCTAVE_SITE_OCT%%/pfstools

%%OCTAVE%%@dirrm %%OCTAVE_SITE_M%%/pfstools