Mercurial > forge

changeset 1688:71fbbb49a983 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added support for int* and uint* types
author jmones
date Fri, 03 Sep 2004 17:57:42 +0000
parents 5d55f9385fda
children 608d5c4d06f2
files main/image/col2im.m
diffstat 1 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/main/image/col2im.m	Fri Sep 03 17:49:37 2004 +0000
+++ b/main/image/col2im.m	Fri Sep 03 17:57:42 2004 +0000
@@ -88,8 +88,11 @@
       endif
       c=1;
       for i=1:mt
-	r=[];
-	for j=1:nt
+	## TODO: check if we can horzcat([],uint8([10;11])) in a
+	## future Octave version > 2.1.58 in order to deuglify this!
+	r=reshape(B(:,c),m,n);
+	c+=1;
+	for j=2:nt
 	  r=horzcat(r, reshape(B(:,c),m,n));
 	  c+=1;
 	endfor
@@ -148,8 +151,18 @@
 %!assert(col2im(ones(1,(10-2+1)*(7-3+1)),[2,3],[10,7],'sliding'), ones((10-2+1),(7-3+1)));
 
 
+%!# disctint on uint8
+%!assert(col2im(uint8(B),[2,5],[6,10],'distinct'), uint8(Ad));
+
+%!# now sliding on uint8
+%!assert(col2im(ones(1,(10-2+1)*(7-3+1),"uint8"),[2,3],[10,7]), ones((10-2+1),(7-3+1),"uint8"));
+
+
 %
 % $Log$
+% Revision 1.2  2004/09/03 17:57:42  jmones
+% Added support for int* and uint* types
+%
 % Revision 1.1  2004/08/18 14:39:07  jmones
 % im2col and col2im added
 %