2.2.0

3 files changed, 37 insertions, 62 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d372462ecc67..e004ca477fcf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pfstools
 	pkgdesc = Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images
-	pkgver = 2.1.0
-	pkgrel = 6
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = http://pfstools.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -30,20 +30,18 @@ pkgbase = pfstools
 	optdepends = octave: Octave support, pfsstat
 	optdepends = opencv: pfsalign
 	optdepends = openexr: OpenEXR support
+	optdepends = python: pfs_split_exposures.py
 	optdepends = qt5-base: pfsalign, pfsview
 	provides = pfscalibration
 	provides = pfstmo
 	conflicts = pfscalibration
 	conflicts = pfstmo
 	options = !libtool
-	source = http://downloads.sourceforge.net/pfstools/pfstools-2.1.0.tgz
-	source = https://sourceforge.net/p/pfstools/bugs/_discuss/thread/7209efcaac/18f1/attachment/pfstools-Fix-build-with-Octave-6.patch
+	source = http://downloads.sourceforge.net/pfstools/pfstools-2.2.0.tgz
 	source = opencv3.patch
 	source = force_imagemagick6.patch
-	b2sums = 11a40c189ca42554a6f341d47b8d4e03145126d5e2d78c702ad097afd190ecc3f789c3b2f3d206dff4b41a14790c80967d5ccaeccd3c5c3cdc1c26acea2e86e9
-	b2sums = 45a33ba5d3e983673f1aeb8bd8dd202502c1245e0ea6c1fa617848be158456de2f157b166e02cc7398c8a3cd3acb385b2dec6ceb693f8fd417d6f43621cbc093
-	b2sums = 8a77db5e6ca74c1833d2de299051d28b3c1614b7686d264950e91c8593a5f20da05b0069c2a7a538694d550d13554d0b8dff646a6bfa9b793ed42a9770b046b0
+	b2sums = dbb5e0ab8613014b3698591acef95f5b846473997b158701ee1dbeb28f43d5af098f4267bac6c5194bf61da619bb5d38c5cd86f9e970483fb550b866b3d43a47
+	b2sums = 62dd4ff4c1fa50e409c1fde9f54996ca007aae98a8b45437f52f77faee8aac2bf9b1b50e41ed5374d958b9f3b5ea97f1fb2b7fa67e38cc79fc05cd40c14903d7
 	b2sums = f7874dbd47672278404085d372c44102a08b0e9ba69aaa0db625bb05cdd493fb6155ee02a76f2ff459797d5a74d326051c3a0979326ed8c36bd1fed5470f9c23
 
 pkgname = pfstools
-
diff --git a/PKGBUILD b/PKGBUILD
index ad47b715f211..674c611fc430 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Brandon Andrews <bsa@bsa.isa-geek.com>
 # Contributor: Mael Kerbiriou <mael.kerbiriouATfreeDOTfr>
 pkgname=pfstools
-pkgver=2.1.0
-pkgrel=6
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images"
 arch=('i686' 'x86_64')
 url="http://pfstools.sourceforge.net/"
@@ -22,6 +22,7 @@ optdepends=('dcraw: RAW support'
             'octave: Octave support, pfsstat'
             'opencv: pfsalign'
             'openexr: OpenEXR support'
+            'python: pfs_split_exposures.py'
             'qt5-base: pfsalign, pfsview')
 makedepends=('cmake' 'qt5-base' 'octave'
              'openexr' 'libmagick6' 'libtiff' 'netpbm'
@@ -29,11 +30,9 @@ makedepends=('cmake' 'qt5-base' 'octave'
              'freeglut' 'glu')
 options=(!libtool)
 source=("http://downloads.sourceforge.net/pfstools/$pkgname-$pkgver.tgz"
-        "https://sourceforge.net/p/pfstools/bugs/_discuss/thread/7209efcaac/18f1/attachment/pfstools-Fix-build-with-Octave-6.patch"
         "opencv3.patch" "force_imagemagick6.patch")
-b2sums=('11a40c189ca42554a6f341d47b8d4e03145126d5e2d78c702ad097afd190ecc3f789c3b2f3d206dff4b41a14790c80967d5ccaeccd3c5c3cdc1c26acea2e86e9'
-        '45a33ba5d3e983673f1aeb8bd8dd202502c1245e0ea6c1fa617848be158456de2f157b166e02cc7398c8a3cd3acb385b2dec6ceb693f8fd417d6f43621cbc093'
-        '8a77db5e6ca74c1833d2de299051d28b3c1614b7686d264950e91c8593a5f20da05b0069c2a7a538694d550d13554d0b8dff646a6bfa9b793ed42a9770b046b0'
+b2sums=('dbb5e0ab8613014b3698591acef95f5b846473997b158701ee1dbeb28f43d5af098f4267bac6c5194bf61da619bb5d38c5cd86f9e970483fb550b866b3d43a47'
+        '62dd4ff4c1fa50e409c1fde9f54996ca007aae98a8b45437f52f77faee8aac2bf9b1b50e41ed5374d958b9f3b5ea97f1fb2b7fa67e38cc79fc05cd40c14903d7'
         'f7874dbd47672278404085d372c44102a08b0e9ba69aaa0db625bb05cdd493fb6155ee02a76f2ff459797d5a74d326051c3a0979326ed8c36bd1fed5470f9c23')
 
 prepare() {
@@ -41,7 +40,6 @@ prepare() {
 
   patch -Np1 < "$srcdir/opencv3.patch"
   patch -Np1 < "$srcdir/force_imagemagick6.patch"
-  patch -Np1 < "$srcdir/pfstools-Fix-build-with-Octave-6.patch"
 }
 
 build() {
diff --git a/opencv3.patch b/opencv3.patch
index c64c945a9476..f58506f974a0 100644
--- a/opencv3.patch
+++ b/opencv3.patch
@@ -1,18 +1,17 @@
 diff --git a/src/camera/pfsalign.cpp b/src/camera/pfsalign.cpp
-index 12c7642..91c97ab 100644
+index 4ea59c7..fcd94b2 100644
 --- a/src/camera/pfsalign.cpp
 +++ b/src/camera/pfsalign.cpp
-@@ -43,7 +43,8 @@
+@@ -48,6 +48,8 @@
  #include <opencv2/core/core.hpp>
  #include <opencv2/highgui/highgui.hpp>
  #include <opencv2/features2d/features2d.hpp>
--#include <opencv2/nonfree/features2d.hpp>
 +#include <opencv2/features2d.hpp>
 +#include <opencv2/xfeatures2d/nonfree.hpp>
  #include <opencv2/calib3d/calib3d.hpp>
  #include <opencv2/imgproc/imgproc.hpp>
  #include <libexif/exif-data.h>
-@@ -61,6 +62,7 @@ class QuietException
+@@ -69,6 +71,7 @@ class QuietException
  
  using namespace cv;
  using namespace std;
@@ -20,54 +19,34 @@ index 12c7642..91c97ab 100644
  
  void printHelp()
  {
-@@ -141,8 +143,12 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
-     //    cv::imshow( "Result2", exp_img );
-     //    cv::waitKey(0);
+@@ -168,11 +171,10 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
+     Mat descr_ref, descr_exp;
  
--    Ptr<FeatureDetector> detector(new DynamicAdaptedFeatureDetector( new SurfAdjuster( (11-sensitivity) * 100.f, 2, 1000 ),
+     #ifdef USE_SURF
+-        Ptr<FeatureDetector> detector(new DynamicAdaptedFeatureDetector( new SurfAdjuster( (11-sensitivity) * 100.f, 2, 1000 ),
 -                                                                     100, 1000, sensitivity/2+2 ));
-+    //Ptr<FeatureDetector> detector(new DynamicAdaptedFeatureDetector( new SurfAdjuster( (11-sensitivity) * 100.f, 2, 1000 ),
-+    //                                                                 100, 1000, sensitivity/2+2 ));
-+    
-+//        SiftDescriptorExtractor surfDesc;
-+    Ptr<SURF> surfDesc = SURF::create();
-+
- //    Ptr<FeatureDetector> detector;
-     //    detector = new GoodFeaturesToTrackDetector();
- //    detector = new SurfFeatureDetector();
-@@ -150,8 +156,8 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
-     std::vector<KeyPoint> keypoints1, keypoints2;
- 
-     toc.tic( "feature detection" );
--    detector->detect( ref_img, keypoints1 );
--    detector->detect( exp_img, keypoints2 );
-+    surfDesc->detect( ref_img, keypoints1 );
-+    surfDesc->detect( exp_img, keypoints2 );
-     toc.toc( );
- 
-     if( keypoints1.size() < 10 || keypoints2.size() < 10 ) {
-@@ -171,13 +177,11 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
++        Ptr<SURF> surfDesc = SURF::create();
+         toc.tic( "feature detection" );
+-        detector->detect( ref_img, keypoints1 );
+-        detector->detect( exp_img, keypoints2 );
++        surfDesc->detect( ref_img, keypoints1 );
++        surfDesc->detect( exp_img, keypoints2 );
+         toc.toc( );
+     #else
+         Ptr<AKAZE> akaze = AKAZE::create();
+@@ -202,13 +204,11 @@ bool alignImagePair( const Mat &ref_img, const Mat &exp_img, Mat &homography, in
          return false;
      }
  
 -    //        SiftDescriptorExtractor surfDesc;
--    SurfDescriptorExtractor surfDesc;
+     #ifdef USE_SURF
+-        SurfDescriptorExtractor surfDesc;
  
-     Mat descr_ref, descr_exp;
-     toc.tic( "descriptor extraction" );
--    surfDesc.compute( ref_img, keypoints1, descr_ref );
--    surfDesc.compute( exp_img, keypoints2, descr_exp );
-+    surfDesc->compute( ref_img, keypoints1, descr_ref );
-+    surfDesc->compute( exp_img, keypoints2, descr_exp );
-     toc.toc( );
+         toc.tic( "descriptor extraction" );
+-        surfDesc.compute( ref_img, keypoints1, descr_ref );
+-        surfDesc.compute( exp_img, keypoints2, descr_exp );
++        surfDesc->compute( ref_img, keypoints1, descr_ref );
++        surfDesc->compute( exp_img, keypoints2, descr_exp );
+         toc.toc( );
+     #endif
  
-     FlannBasedMatcher matcher;
-@@ -226,7 +230,7 @@
-
-     vector<uchar> inliners(matches_sym.size(), 0);
-     //        affine = findHomography( pp1, pp2, inliners, CV_RANSAC, 1. );
--    homography = findHomography( pp2, pp1, CV_RANSAC, 1., inliners );
-+    homography = findHomography( pp2, pp1, RANSAC, 1., inliners );
-
-     //    solve( pp1, pp2, affine, DECOMP_SVD );
-     //    Mat affine = (Mat_<float>(2,3) << 1, 0, 0, 0, 1, 10);