[pfstmo] New upstream version: bugfixes; new solver for fattal02
Tomas Smetana
tsmetana at fedoraproject.org
Wed Aug 1 14:14:07 UTC 2012
commit eb7b4d5592874b9b4a1a2c8a529335d78db756d0
Author: Tomas Smetana <tsmetana at redhat.com>
Date: Wed Aug 1 10:13:23 2012 -0400
New upstream version: bugfixes; new solver for fattal02
and video filtering for mantiuk08 operators
.gitignore | 1 +
pfstmo-1.3.2-zd.patch | 92 ---------------------------------------------
pfstmo-1.4-auto_ptr.patch | 10 -----
pfstmo-1.5-auto_ptr.patch | 11 +++++
pfstmo-1.5-zd.patch | 83 ++++++++++++++++++++++++++++++++++++++++
pfstmo.spec | 12 ++++--
sources | 2 +-
7 files changed, 104 insertions(+), 107 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ce25c2..1dedecd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
pfstmo-1.4.tar.gz
+/pfstmo-1.5.tar.gz
diff --git a/pfstmo-1.5-auto_ptr.patch b/pfstmo-1.5-auto_ptr.patch
new file mode 100644
index 0000000..7da8506
--- /dev/null
+++ b/pfstmo-1.5-auto_ptr.patch
@@ -0,0 +1,11 @@
+diff -up pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.h.auto_ptr pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.h
+--- pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.h.auto_ptr 2012-08-01 10:02:24.197666709 -0400
++++ pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.h 2012-08-01 10:02:45.520667829 -0400
+@@ -35,6 +35,7 @@
+ #include "display_size.h"
+
+ #include "pfstmo.h"
++#include <backward/auto_ptr.h>
+
+ #define DATMO_TF_TAPSIZE 4 /* Number of samples required for the temporal filter */
+
diff --git a/pfstmo-1.5-zd.patch b/pfstmo-1.5-zd.patch
new file mode 100644
index 0000000..becab74
--- /dev/null
+++ b/pfstmo-1.5-zd.patch
@@ -0,0 +1,83 @@
+diff -up pfstmo-1.5/src/mantiuk08/cqp/mg_pdip.c.zd pfstmo-1.5/src/mantiuk08/cqp/mg_pdip.c
+--- pfstmo-1.5/src/mantiuk08/cqp/mg_pdip.c.zd 2012-08-01 09:44:04.232580486 -0400
++++ pfstmo-1.5/src/mantiuk08/cqp/mg_pdip.c 2012-08-01 09:50:07.137598780 -0400
+@@ -307,7 +307,7 @@ mg_pdip_iterate (void *vstate, const gsl
+ printf("\n *** Predictor Step ***\n");
+ printf("\nthe right-hand side of the KKT-system:\n");
+ for(i=0; i<state->r->size; i++)
+- printf("r[%d]=%f ",(int)i,gsl_vector_get(state->r,i));
++ printf("r[%zd]=%f ", i,gsl_vector_get(state->r,i));
+ printf("\n");
+ printf("\nsolution (delta_x,-delta_y,-delta_z):\n");
+ for(i=0; i<delta->size; i++)
+@@ -369,7 +369,7 @@ mg_pdip_iterate (void *vstate, const gsl
+ printf("\n *** Corrector Step ***\n");
+ printf("the right-hand side:\n");
+ for(i=0; i<state->r->size; i++)
+- printf("r[%d]=%f ",(int)i,gsl_vector_get(state->r,i));
++ printf("r[%zd]=%f ", i,gsl_vector_get(state->r,i));
+ printf("\n");
+ for(i=0; i<delta->size; i++)
+ printf("%6.3f ",gsl_vector_get(delta,i));
+@@ -671,24 +671,24 @@ print_vectors(const gsl_vector * x, cons
+ {
+ size_t i;
+
+- printf("\nx[1 x %d]:\n",(int)x->size);
++ printf("\nx[1 x %zd]:\n", x->size);
+ for(i=0; i<x->size; i++)
+ printf("%f ",gsl_vector_get(x,i));
+ printf("\n");
+
+ if( y != NULL ) {
+- printf("\ny[1 x %d]: (LM zu Ax=b)\n",(int)y->size);
++ printf("\ny[1 x %zd]: (LM zu Ax=b)\n", y->size);
+ for(i=0; i<y->size; i++)
+ printf("%f ",gsl_vector_get(y,i));
+ printf("\n");
+ }
+
+- printf("\nz[1 x %d]: (LM zu Cx>=d)\n",(int)z->size);
++ printf("\nz[1 x %zd]: (LM zu Cx>=d)\n", z->size);
+ for(i=0; i<z->size; i++)
+ printf("%f ",gsl_vector_get(z,i));
+ printf("\n");
+
+- printf("\ns[1 x %d]: (Slack zu Cx>=d)\n",(int)s->size);
++ printf("\ns[1 x %zd]: (Slack zu Cx>=d)\n", s->size);
+ for(i=0; i<s->size; i++)
+ printf("%f ",gsl_vector_get(s,i));
+ printf("\n");
+diff -up pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.cpp
+--- pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.cpp.zd 2012-08-01 09:51:12.959601920 -0400
++++ pfstmo-1.5/src/mantiuk08/display_adaptive_tmo.cpp 2012-08-01 09:51:56.674604844 -0400
+@@ -536,7 +536,7 @@ int solve( gsl_matrix *Q, gsl_vector *q,
+ status = gsl_cqpminimizer_iterate(s);
+ status = gsl_cqpminimizer_test_convergence(s, 1e-10, 1e-10);
+
+- if( verbose ) fprintf( stderr, "%4d %14.8f %13.6e %13.6e\n", (int)iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
++ if( verbose ) fprintf( stderr, "%4zd %14.8f %13.6e %13.6e\n", iter, gsl_cqpminimizer_f(s), gsl_cqpminimizer_gap(s), gsl_cqpminimizer_residuals_norm(s));
+
+ if(status == GSL_SUCCESS)
+ {
+diff -up pfstmo-1.5/src/mantiuk08/pfstmo_mantiuk08.cpp.zd pfstmo-1.5/src/mantiuk08/pfstmo_mantiuk08.cpp
+--- pfstmo-1.5/src/mantiuk08/pfstmo_mantiuk08.cpp.zd 2012-08-01 09:52:36.164606737 -0400
++++ pfstmo-1.5/src/mantiuk08/pfstmo_mantiuk08.cpp 2012-08-01 09:54:25.961613095 -0400
+@@ -233,7 +233,7 @@ void tmo_mantiuk08(int argc, char * argv
+
+ const char *file_name = frame->getTags()->getString( "FILE_NAME" );
+ if( file_name == NULL )
+- sprintf( frame_name, "frame #%d", (int)frame_no );
++ sprintf( frame_name, "frame #%zd", frame_no );
+ else {
+ int len = strlen( file_name );
+ if( len > FRAME_NAME_MAX ) // In case file name is too long
+@@ -294,7 +294,7 @@ void tmo_mantiuk08(int argc, char * argv
+
+ if( tc_FH != NULL ) {
+ for( int i=0; i < tc_filt->size; i++ )
+- fprintf( tc_FH, "%d,%g,%g,%g\n", (int)frame_no, tc_filt->x_i[i], tc_filt->y_i[i], df->inv_display( (float)pow( 10, tc_filt->y_i[i] ) ) );
++ fprintf( tc_FH, "%zd,%g,%g,%g\n", frame_no, tc_filt->x_i[i], tc_filt->y_i[i], df->inv_display( (float)pow( 10, tc_filt->y_i[i] ) ) );
+ }
+
+ // int res;
diff --git a/pfstmo.spec b/pfstmo.spec
index 05ee929..c1644cf 100644
--- a/pfstmo.spec
+++ b/pfstmo.spec
@@ -1,15 +1,15 @@
Name: pfstmo
-Version: 1.4
-Release: 5%{?dist}
+Version: 1.5
+Release: 1%{?dist}
Summary: PFS tone mapping operators
Group: Applications/Multimedia
License: GPLv2+
URL: http://pfstools.sourceforge.net/
Source0: http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
-Patch1: pfstmo-1.3.2-zd.patch
+Patch1: pfstmo-1.5-zd.patch
Patch2: pfstmo-CXXFLAGS.patch
-Patch3: pfstmo-1.4-auto_ptr.patch
+Patch3: pfstmo-1.5-auto_ptr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtool
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 01 2012 Tomas Smetana <tsmetana at redhat.com> - 1.5-1
+- New upstream version: bugfixes; new solver for fattal02
+ and video filtering for mantiuk08 operators
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 71c2053..b51f100 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90409a9adda70f59001c04cafcdab8d6 pfstmo-1.4.tar.gz
+f0dc0baee2be66b1eedf77a45864c0e9 pfstmo-1.5.tar.gz
More information about the scm-commits
mailing list