channels/chnsCompute.m: binSize defaults to shrink (proper handling a…

…t runtime)
JasonWay · Dec 20, 2012 · 2eba98f · 2eba98f
1 parent 1bf5874
commit 2eba98f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/channels/chnsCompute.m b/channels/chnsCompute.m
@@ -128,8 +128,6 @@
     'colorChn',0,'normRad',5,'normConst',.005}, 1 );
   pChns.pGradHist = getPrmDflt( pChns.pGradHist, {'enabled',1,...
     'binSize',[],'nOrients',6,'softBin',0,'useHog',0,'clipHog',.2}, 1 );
-  if( isempty(pChns.pGradHist.binSize) )
-    pChns.pGradHist.binSize=pChns.shrink; end
   nc=length(pChns.pCustom); pc=cell(1,nc);
   for i=1:nc, pc{i} = getPrmDflt( pChns.pCustom(i), {'enabled',1,...
       'name','REQ','hFunc','REQ','pFunc',{},'padWith',0}, 1 ); end
@@ -163,7 +161,8 @@
 % compute gradient histgoram channels
 p=pChns.pGradHist; nm='gradient histogram';
 if( p.enabled )
-  H=gradientHist(M,O,p.binSize,p.nOrients,p.softBin,p.useHog,p.clipHog);
+  binSize=p.binSize; if(isempty(binSize)), binSize=shrink; end
+  H=gradientHist(M,O,binSize,p.nOrients,p.softBin,p.useHog,p.clipHog);
   chns=addChn(chns,H,nm,pChns.pGradHist,0,h,w);
 end