rpms/pfstools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebuild for octave 5.1

Browse Source
This commit is contained in:
Orion Poplawski 2019-06-16 20:45:16 -06:00
parent 84b30829bb
commit 90a284a1b8
2 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
pfstools-octave5.1.patch Normal file
View File

@ -0,0 +1,75 @@
diff --git a/src/octave/pfsget.cpp b/src/octave/pfsget.cpp
index 2c0853b..29e5e2d 100644
--- a/src/octave/pfsget.cpp
+++ b/src/octave/pfsget.cpp
@@ -155,9 +155,7 @@ DEFUN_DLD( pfsget, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
// if( fh != stdin ) fclose( fh );
diff --git a/src/octave/pfsput.cpp b/src/octave/pfsput.cpp
index 97fd94a..8c043c9 100644
--- a/src/octave/pfsput.cpp
+++ b/src/octave/pfsput.cpp
@@ -191,9 +191,7 @@ DEFUN_DLD( pfsput, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
return retval;
diff --git a/src/octave/pfsread.cpp b/src/octave/pfsread.cpp
index 137d1c6..f393136 100644
--- a/src/octave/pfsread.cpp
+++ b/src/octave/pfsread.cpp
@@ -105,9 +105,7 @@ DEFUN_DLD( pfsread, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
if( fh != stdin ) fclose( fh );
diff --git a/src/octave/pfstransform_colorspace.cpp b/src/octave/pfstransform_colorspace.cpp
index 64b7e42..fd8413b 100644
--- a/src/octave/pfstransform_colorspace.cpp
+++ b/src/octave/pfstransform_colorspace.cpp
@@ -86,9 +86,7 @@ DEFUN_DLD( pfstransform_colorspace, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
return retval;
diff --git a/src/octave/pfswrite.cpp b/src/octave/pfswrite.cpp
index 8475c3b..bc15a28 100644
--- a/src/octave/pfswrite.cpp
+++ b/src/octave/pfswrite.cpp
@@ -109,9 +109,7 @@ DEFUN_DLD( pfswrite, args, , helpString)
}
catch( pfs::Exception ex )
{
- char error_message[100];
- sprintf( error_message, "%s: %s", SCRIPT_NAME, ex.getMessage() );
- error( error_message );
+ error( "%s: %s", SCRIPT_NAME, ex.getMessage() );
}
if( fh != stdout ) fclose( fh );

10
pfstools.spec
View File

@ -1,11 +1,14 @@
Name: pfstools
Version: 2.1.0
Release: 5%{?dist}
Release: 6%{?dist}
Summary: Programs for handling high-dynamic range images
License: GPLv2+
URL: http://pfstools.sourceforge.net/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
# Fix build with octave 5.1
# https://sourceforge.net/p/pfstools/git/merge-requests/1/
Patch0: pfstools-octave5.1.patch
BuildRequires: cmake
BuildRequires: libtiff-devel
@ -121,7 +124,7 @@ etc., for developing programs which can handle HDR graphics files.
%prep
%setup -q
%autosetup -p1
%build
%{?el7:export CXXFLAGS="%{optflags} -std=gnu++11"}
@ -293,6 +296,9 @@ make
%{_includedir}/pfs
%changelog
* Sun Jun 16 2019 Orion Poplawski <orion@nwra.com> - 2.1.0-6
- Rebuild for octave 5.1
* Thu Apr 11 2019 Richard Shaw <hobbes1069@gmail.com> - 2.1.0-5
- Rebuild for OpenEXR 2.3.0.