diff Problems/generateImageDenoiseProblem.m @ 126:db5a7fe1a404 ivand_dev

Merge from branch "sup_158_IMG_Processing_toolbox_"

--- a/Problems/generateImageDenoiseProblem.m	Wed May 25 13:33:47 2011 +0100
+++ b/Problems/generateImageDenoiseProblem.m	Wed May 25 15:30:34 2011 +0100
@@ -1,14 +1,5 @@
 function data=generateImageDenoiseProblem(im, trainnum, blocksize, dictsize, sigma, gain, maxval, initdict);
-%%% Generate Image Denoising Problem
-%
-%   Centre for Digital Music, Queen Mary, University of London.
-%   This file copyright 2010 Ivan Damnjanovic.
-%
-%   This program is free software; you can redistribute it and/or
-%   modify it under the terms of the GNU General Public License as
-%   published by the Free Software Foundation; either version 2 of the
-%   License, or (at your option) any later version.  See the file
-%   COPYING included with this distribution for more information.
+%% Generate Image Denoising Problem
 %   
 %   generateImageDenoiseProblem is a part of the SMALLbox and generates
 %   a problem that can be used for comparison of Dictionary Learning/Sparse
@@ -39,6 +30,16 @@
 %   -   maxval - maximum value (default - 255)
 %   -   initdict - initial dictionary (default - 4x overcomlete dct)
 %   -   signalDim - signal dimension (default - 2)
+
+%
+%   Centre for Digital Music, Queen Mary, University of London.
+%   This file copyright 2010 Ivan Damnjanovic.
+%
+%   This program is free software; you can redistribute it and/or
+%   modify it under the terms of the GNU General Public License as
+%   published by the Free Software Foundation; either version 2 of the
+%   License, or (at your option) any later version.  See the file
+%   COPYING included with this distribution for more information.
 %
 %   Based on KSVD denoise demo by Ron Rubinstein
 %   See also KSVDDENOISEDEMO and KSVDDEMO.
@@ -136,7 +137,7 @@
 end
 
 %  Noisy image blocks 
-xcol=im2col(x,blocksize,'sliding');
+xcol=im2colstep(x,blocksize);
 [b1, dc] = remove_dc(xcol,'columns');
 
 %% output structure %%