# HG changeset patch # User Jaroslav Hajek # Date 1254427081 -7200 # Node ID 5b3b9dcfd59c105190a8834c5be6d2747a8c0642 # Parent c338cb954e582848855fceeb47d590091752a072 fix crash in cellfun diff -r c338cb954e58 -r 5b3b9dcfd59c src/ChangeLog --- a/src/ChangeLog Thu Oct 01 15:10:14 2009 -0400 +++ b/src/ChangeLog Thu Oct 01 21:58:01 2009 +0200 @@ -1,3 +1,8 @@ +2009-10-01 Jaroslav Hajek + + * DLD-FUNCTIONS/cellfun.cc (Fcellfun): Fix initialization, add missing + break. + 2009-10-01 John W. Eaton * gl-render.cc (opengl_renderer::draw (const image::properties&)): diff -r c338cb954e58 -r 5b3b9dcfd59c src/DLD-FUNCTIONS/cellfun.cc --- a/src/DLD-FUNCTIONS/cellfun.cc Thu Oct 01 15:10:14 2009 -0400 +++ b/src/DLD-FUNCTIONS/cellfun.cc Thu Oct 01 21:58:01 2009 +0200 @@ -475,13 +475,12 @@ inputlist(j) = cinputs[j](0); } - k = inputs[0].numel (); - for (int j = 0; j < nargin; j++) { if (mask[j]) { fdims = inputs[j].dims (); + k = inputs[j].numel (); for (int i = j+1; i < nargin; i++) { if (mask[i] && inputs[i].dims () != fdims) @@ -490,6 +489,7 @@ goto cellfun_err; } } + break; } }