From 5e41fbfe2a47af1a06cdd2f1b1fb6b62045f3c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Kal=C3=B8r?= <anders@kaloer.com>
Date: Thu, 27 Aug 2015 16:53:20 +0200
Subject: [PATCH 1/2] Add RowSlice and ColSlice test cases for DMat

---
 tests/mat.rs | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/tests/mat.rs b/tests/mat.rs
index 234beba1..046a0a06 100644
--- a/tests/mat.rs
+++ b/tests/mat.rs
@@ -3,7 +3,7 @@ extern crate rand;
 
 use rand::random;
 use na::{Vec1, Vec3, Mat1, Mat2, Mat3, Mat4, Mat5, Mat6, Rot2, Rot3, Persp3, PerspMat3, Ortho3,
-         OrthoMat3, DMat, DVec, Row, Col, BaseFloat, Diag, Transpose, RowSlice};
+         OrthoMat3, DMat, DVec, Row, Col, BaseFloat, Diag, Transpose, RowSlice, ColSlice};
 
 macro_rules! test_inv_mat_impl(
   ($t: ty) => (
@@ -279,6 +279,49 @@ fn test_transpose_dmat() {
     assert!(na::transpose(&na::transpose(&mat)) == mat);
 }
 
+#[test]
+fn test_row_slice_dmat() {
+    let mat = DMat::from_row_vec(
+        5,
+        4,
+        &[
+            1u32,2,  3,  4,
+            5,   6,  7,  8,
+            9,   10, 11, 12,
+            13,  14, 15, 16,
+            17,  18, 19, 20,
+        ]
+    );
+
+    assert_eq!(&DVec::from_slice(4, &[1u32, 2, 3, 4]), &mat.row_slice(0, 0, 4));
+    assert_eq!(&DVec::from_slice(2, &[1u32, 2]), &mat.row_slice(0, 0, 2));
+    assert_eq!(&DVec::from_slice(2, &[10u32, 11]), &mat.row_slice(2, 1, 3));
+    assert_eq!(&DVec::from_slice(2, &[19u32, 20]), &mat.row_slice(4, 2, 4));
+}
+
+#[test]
+fn test_col_slice_dmat() {
+    let mat = DMat::from_row_vec(
+        8,
+        4,
+        &[
+            1u32,2,  3,  4,
+            5,   6,  7,  8,
+            9,   10, 11, 12,
+            13,  14, 15, 16,
+            17,  18, 19, 20,
+            21,  22, 23, 24,
+            25,  26, 27, 28,
+            29,  30, 31, 32
+        ]
+    );
+
+    assert_eq!(&DVec::from_slice(8, &[1u32, 5, 9, 13, 17, 21, 25, 29]), &mat.col_slice(0, 0, 8));
+    assert_eq!(&DVec::from_slice(3, &[1u32, 5, 9]), &mat.col_slice(0, 0, 3));
+    assert_eq!(&DVec::from_slice(5, &[11u32, 15, 19, 23, 27]), &mat.col_slice(2, 2, 7));
+    assert_eq!(&DVec::from_slice(2, &[28u32, 32]), &mat.col_slice(3, 6, 8));
+}
+
 #[test]
 fn test_dmat_from_vec() {
     let mat1 = DMat::from_row_vec(

From 043d7ab108fe07bb9397e3040d0746d2ddb24b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Kal=C3=B8r?= <anders@kaloer.com>
Date: Thu, 27 Aug 2015 16:55:20 +0200
Subject: [PATCH 2/2] Fix wrong allocated vector length in RowSlice

The length of the returned DVec should correspond to the
the number of elements in the slice and not the number of rows in the
matrix.
---
 src/structs/dmat.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/structs/dmat.rs b/src/structs/dmat.rs
index d2c86acd..3a176398 100644
--- a/src/structs/dmat.rs
+++ b/src/structs/dmat.rs
@@ -559,7 +559,7 @@ impl<N: Copy> RowSlice<DVec<N>> for DMat<N> {
         assert!(col_start < col_end);
         assert!(col_end <= self.ncols);
         let mut slice : DVec<N> = unsafe {
-            DVec::new_uninitialized(self.nrows)
+            DVec::new_uninitialized(col_end - col_start)
         };
         let mut slice_idx = 0;
         for col_id in col_start..col_end {