swap width/height in Matrix constructor

Matrix constructor is (rows, cols)/(height,width)