acfTrain.m: minor fix for case when using cropped windows for trainin…

…g (thanks Jiangyu Liu)
gcjyzdd · Jan 27, 2015 · 0a03b3f · 0a03b3f
1 parent a348711
commit 0a03b3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/detector/acfTrain.m b/detector/acfTrain.m
@@ -109,7 +109,7 @@
 % See also acfReadme, acfDetect, acfDemoInria, acfModify, acfTest,
 % chnsCompute, chnsPyramid, adaBoostTrain, bbGt, bbNms, jitterImage
 %
-% Piotr's Computer Vision Matlab Toolbox      Version 3.40
+% Piotr's Computer Vision Matlab Toolbox      Version NEW
 % Copyright 2014 Piotr Dollar.  [pdollar-at-gmail.com]
 % Licensed under the Simplified BSD License [see external/bsd.txt]
 
@@ -230,7 +230,7 @@
 if( exist(crDir,'dir') && stage==0 )
   % if window directory is specified simply load windows
   fs=bbGt('getFiles',{crDir}); nImg=length(fs); assert(nImg>0);
-  if(nImg>n), fs=fs(:,randSample(nImg,n)); end; n=nImg;
+  if(nImg>n), fs=fs(:,randSample(nImg,n)); else n=nImg; end
   for i=1:n, fs{i}=[{opts.imreadf},fs(i),opts.imreadp]; end
   Is=cell(1,n); parfor i=1:n, Is{i}=feval(fs{i}{:}); end
 else

diff --git a/external/history.txt b/external/history.txt
@@ -1,6 +1,6 @@
 Version NEW
  -acfSweeps.m: Added ACF parameter sweep code to toolbox
- -minor: opticalFlow
+ -minor: opticalFlow, acfTrain
 
 Version 3.40 (01-Nov-2014)
  -Added LDCF detector described in NIPS14 paper