[shark] 79/79: Update Pgm.h

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Nov 26 15:41:53 UTC 2015


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

ghisvail-guest pushed a commit to branch master
in repository shark.

commit 384186ac91facfc46496c3aab4acd05edb651b16
Author: Christian Igel <igel at diku.dk>
Date:   Thu Nov 19 21:50:03 2015 +0100

    Update Pgm.h
    
    corrected mistake in importPGM when going from isx, isy to sx, sy
---
 include/shark/Data/Pgm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/shark/Data/Pgm.h b/include/shark/Data/Pgm.h
index 5c85d45..c43c72b 100644
--- a/include/shark/Data/Pgm.h
+++ b/include/shark/Data/Pgm.h
@@ -144,8 +144,8 @@ void importPGM( std::string const& fileName, T& data, std::size_t& sx, std::size
 	int isx;
 	int isy;
 	detail::importPGM(fileName, &pData, isx, isy);
-	sx = std::size_t(sx);
-	sx = std::size_t(sy);
+	sx = std::size_t(isx);
+	sy = std::size_t(isy);
 	data.resize(sx*sy);
 	std::copy(pData, pData + sx*sy, data.begin());
 	delete [] pData;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git



More information about the debian-science-commits mailing list