Sophie

Sophie

distrib > Fedora > 14 > x86_64 > by-pkgid > faa5ac7f53cfeaaae8f6a55138f69163 > files > 1

pfstmo-1.4-1.fc13.src.rpm

diff -up pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c
--- pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c.zd	2009-01-06 11:17:15.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/cqp/mg_pdip.c	2009-01-06 11:19:04.000000000 -0800
@@ -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 ",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 ",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",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",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",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",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.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp
--- pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp.zd	2009-01-06 11:20:13.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/display_adaptive_tmo.cpp	2009-01-06 11:20:41.000000000 -0800
@@ -586,7 +586,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", 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.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp
--- pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp.zd	2009-01-06 11:21:03.000000000 -0800
+++ pfstmo-1.3.2/src/mantiuk08/pfstmo_mantiuk08.cpp	2009-01-06 11:21:43.000000000 -0800
@@ -220,7 +220,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", 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
@@ -279,7 +279,7 @@ void tmo_mantiuk08(int argc, char * argv
       if( temporal_filter == 1 ) {
         // First pass of the temporal filter - store tone-curves, do not tone-map
         
-        fprintf( tp_FH, "%d,%d\n", frame_no, tc.size );          
+        fprintf( tp_FH, "%zd,%zd\n", frame_no, tc.size );          
         for( int i=0; i < tc.size; i++ )
           fprintf( tp_FH, "%g,%g\n", tc.x_i[i], tc.y_i[i] );
 
@@ -295,7 +295,7 @@ void tmo_mantiuk08(int argc, char * argv
 
         if( tc_FH != NULL ) {
           for( int i=0; i < tc.size; i++ )
-            fprintf( tc_FH, "%d,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
+            fprintf( tc_FH, "%zd,%g,%g,%g\n", frame_no, tc.x_i[i], tc.y_i[i], df->inv_display( (float)pow( 10, tc.y_i[i] ) ) );
         }      
     
 //    int res;