[151478] trunk/dports/aqua/qtiplot/files/patch-gsl2.diff

[larryv at macports.org]

Revision: 151478
          https://trac.macports.org/changeset/151478
Author:   larryv at macports.org
Date:     2016-08-16 18:52:30 -0700 (Tue, 16 Aug 2016)
Log Message:
-----------
qtiplot: Normalize line endings in patch

Modified Paths:
--------------
    trunk/dports/aqua/qtiplot/files/patch-gsl2.diff

Property Changed:
----------------
    trunk/dports/aqua/qtiplot/files/patch-gsl2.diff

Modified: trunk/dports/aqua/qtiplot/files/patch-gsl2.diff
===================================================================
--- trunk/dports/aqua/qtiplot/files/patch-gsl2.diff	2016-08-17 00:46:58 UTC (rev 151477)
+++ trunk/dports/aqua/qtiplot/files/patch-gsl2.diff	2016-08-17 01:52:30 UTC (rev 151478)
@@ -1,58 +1,58 @@
-Description: adoptation to gsl2.
-Author: Damir Islamov <damir at secretlaboratory.ru>, Anton Gladky <gladk at debian.org>
-Last-Update: 2015-12-04
-
-Index: qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp
-===================================================================
---- qtiplot/src/analysis/Fit.cpp
-+++ qtiplot/src/analysis/Fit.cpp
-@@ -39,6 +39,7 @@
- #include <gsl/gsl_statistics.h>
- #include <gsl/gsl_blas.h>
- #include <gsl/gsl_cdf.h>
-+#include <gsl/gsl_version.h>
- 
- #include <QApplication>
- #include <QMessageBox>
-@@ -126,10 +127,19 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
- 			break;
- 		}
- 	}
--
- 	if (status){
-+	    // allocate memory and calculate covariance matrix based on residuals
-+#if GSL_MAJOR_VERSION == 2
-+	    gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
-+	    gsl_multifit_fdfsolver_jac(s, J);
-+	    gsl_multifit_covar (J, 0.0, covar);
-+	    iterations = 0;
-+	    // free previousely allocated memory
-+	    gsl_matrix_free (J);
-+#else
- 	    gsl_multifit_covar (s->J, 0.0, covar);
- 	    iterations = 0;
-+#endif
- 	    return s;
- 	}
- 
-@@ -154,10 +164,18 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
- 
- 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
- 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
--
-+#if GSL_MAJOR_VERSION == 2
-+	// allocate memory and calculate covariance matrix based on residuals
-+	gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
-+	gsl_multifit_fdfsolver_jac(s, J);
-+	gsl_multifit_covar (J, 0.0, covar);
-+	iterations = iter;
-+	// free previousely allocated memory
-+	gsl_matrix_free (J);
-+#else
- 	gsl_multifit_covar (s->J, 0.0, covar);
--
- 	iterations = iter;
-+#endif
- 	return s;
- }
- 
+Description: adoptation to gsl2.
+Author: Damir Islamov <damir at secretlaboratory.ru>, Anton Gladky <gladk at debian.org>
+Last-Update: 2015-12-04
+
+Index: qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp
+===================================================================
+--- qtiplot/src/analysis/Fit.cpp
++++ qtiplot/src/analysis/Fit.cpp
+@@ -39,6 +39,7 @@
+ #include <gsl/gsl_statistics.h>
+ #include <gsl/gsl_blas.h>
+ #include <gsl/gsl_cdf.h>
++#include <gsl/gsl_version.h>
+ 
+ #include <QApplication>
+ #include <QMessageBox>
+@@ -126,10 +127,19 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ 			break;
+ 		}
+ 	}
+-
+ 	if (status){
++	    // allocate memory and calculate covariance matrix based on residuals
++#if GSL_MAJOR_VERSION == 2
++	    gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
++	    gsl_multifit_fdfsolver_jac(s, J);
++	    gsl_multifit_covar (J, 0.0, covar);
++	    iterations = 0;
++	    // free previousely allocated memory
++	    gsl_matrix_free (J);
++#else
+ 	    gsl_multifit_covar (s->J, 0.0, covar);
+ 	    iterations = 0;
++#endif
+ 	    return s;
+ 	}
+ 
+@@ -154,10 +164,18 @@ gsl_multifit_fdfsolver * Fit::fitGSL(gsl
+ 
+ 		status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance);
+ 	} while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations);
+-
++#if GSL_MAJOR_VERSION == 2
++	// allocate memory and calculate covariance matrix based on residuals
++	gsl_matrix *J = gsl_matrix_alloc(d_n, d_p);
++	gsl_multifit_fdfsolver_jac(s, J);
++	gsl_multifit_covar (J, 0.0, covar);
++	iterations = iter;
++	// free previousely allocated memory
++	gsl_matrix_free (J);
++#else
+ 	gsl_multifit_covar (s->J, 0.0, covar);
+-
+ 	iterations = iter;
++#endif
+ 	return s;
+ }
+ 


Property changes on: trunk/dports/aqua/qtiplot/files/patch-gsl2.diff
___________________________________________________________________
Added: svn:eol-style
   + native
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160816/e46e8ab1/attachment.html>