[med-svn] [relion] 04/10: d/patches: Add 0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch

[Roland Fehrenbacher]

This is an automated email from the git hooks/post-receive script.

rfehren-guest pushed a commit to branch master
in repository relion.

commit 1753c6b2a919ada1c1f6428399e591a85c4b49e3
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Mon Oct 26 17:29:18 2015 +0000

    d/patches: Add 0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch
---
 ...-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch b/debian/patches/0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch
new file mode 100644
index 0000000..e100250
--- /dev/null
+++ b/debian/patches/0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch
@@ -0,0 +1,25 @@
+From b19708787bfb2e26f19733b3914b60037f5bc144 Mon Sep 17 00:00:00 2001
+From: Roland Fehrenbacher <rf at q-leap.de>
+Date: Mon, 26 Oct 2015 17:27:17 +0000
+Subject: [PATCH] Add ml_optimiser_mpi.cpp length_fn_ctf patch
+
+---
+ src/ml_optimiser_mpi.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ml_optimiser_mpi.cpp b/src/ml_optimiser_mpi.cpp
+index 080e905..c94e310 100644
+--- a/src/ml_optimiser_mpi.cpp
++++ b/src/ml_optimiser_mpi.cpp
+@@ -402,7 +402,7 @@ void MlOptimiserMpi::expectation()
+ 			node->relion_MPI_Send(&my_nr_images, 1, MPI_INT, first_slave, MPITAG_JOB_REQUEST, MPI_COMM_WORLD);
+ 			node->relion_MPI_Send(MULTIDIM_ARRAY(exp_metadata), MULTIDIM_SIZE(exp_metadata), MY_MPI_DOUBLE, first_slave, MPITAG_METADATA, MPI_COMM_WORLD);
+ 			// Also send exp_fn_ctfs if necessary
+-			length_fn_ctf = exp_fn_img.length() + 1; // +1 to include \0 at the end of the string
++			length_fn_ctf = exp_fn_ctf.length() + 1; // +1 to include \0 at the end of the string
+ 			node->relion_MPI_Send(&length_fn_ctf, 1, MPI_INT, first_slave, MPITAG_JOB_REQUEST, MPI_COMM_WORLD);
+ 			if (length_fn_ctf > 1)
+ 				node->relion_MPI_Send((void*)exp_fn_ctf.c_str(), length_fn_ctf, MPI_CHAR, first_slave, MPITAG_METADATA, MPI_COMM_WORLD);
+-- 
+2.6.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 3e9a24e..4bf3b50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix-fltk-config-path-in-configure.patch
+0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch
 0003-Add-enable-gui-flag-to-configure.patch
 0004-Fix-fltk-header-includes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git