From 70e23eab28fc47cb74689d64f8e72b084f7bc48a Mon Sep 17 00:00:00 2001 From: pdollar Date: Sun, 26 Oct 2014 13:19:32 -0700 Subject: [PATCH] updated toolbox name and headers --- channels/chnsCompute.m | 5 ++--- channels/chnsPyramid.m | 5 ++--- channels/chnsScaling.m | 5 ++--- channels/convBox.m | 5 ++--- channels/convMax.m | 5 ++--- channels/convTri.m | 5 ++--- channels/fhog.m | 5 ++--- channels/gradient2.m | 5 ++--- channels/gradientHist.m | 5 ++--- channels/gradientMag.m | 5 ++--- channels/hog.m | 5 ++--- channels/hogDraw.m | 5 ++--- channels/imPad.m | 5 ++--- channels/imResample.m | 5 ++--- channels/private/chnsTestCpp.cpp | 5 ++--- channels/private/convConst.cpp | 5 ++--- channels/private/gradientMex.cpp | 5 ++--- channels/private/imPadMex.cpp | 5 ++--- channels/private/imResampleMex.cpp | 5 ++--- channels/private/rgbConvertMex.cpp | 5 ++--- channels/private/sse.hpp | 5 ++--- channels/private/wrappers.hpp | 5 ++--- channels/rgbConvert.m | 5 ++--- classify/adaBoostApply.m | 5 ++--- classify/adaBoostTrain.m | 5 ++--- classify/binaryTreeApply.m | 5 ++--- classify/binaryTreeTrain.m | 5 ++--- classify/confMatrix.m | 5 ++--- classify/confMatrixShow.m | 5 ++--- classify/demoCluster.m | 5 ++--- classify/demoGenData.m | 5 ++--- classify/distMatrixShow.m | 5 ++--- classify/fernsClfApply.m | 5 ++--- classify/fernsClfTrain.m | 5 ++--- classify/fernsInds.m | 5 ++--- classify/fernsRegApply.m | 5 ++--- classify/fernsRegTrain.m | 5 ++--- classify/forestApply.m | 5 ++--- classify/forestTrain.m | 5 ++--- classify/kmeans2.m | 5 ++--- classify/meanShift.m | 5 ++--- classify/meanShiftIm.m | 5 ++--- classify/meanShiftImExplore.m | 5 ++--- classify/pca.m | 5 ++--- classify/pcaApply.m | 5 ++--- classify/pcaRandVec.m | 5 ++--- classify/pcaVisualize.m | 5 ++--- classify/pdist2.m | 5 ++--- classify/private/IDX2order.m | 5 ++--- classify/private/binaryTreeTrain1.cpp | 5 ++--- classify/private/fernsInds1.c | 9 ++++----- classify/private/forestFindThr.cpp | 17 ++++++++--------- classify/private/forestInds.cpp | 5 ++--- classify/private/meanShift1.c | 9 ++++----- classify/private/meanShiftPost.m | 5 ++--- classify/rbfComputeBasis.m | 5 ++--- classify/rbfComputeFtrs.m | 5 ++--- classify/rbfDemo.m | 5 ++--- classify/softMin.m | 5 ++--- classify/visualizeData.m | 5 ++--- detector/acfDemoCal.m | 5 ++--- detector/acfDemoInria.m | 5 ++--- detector/acfDetect.m | 5 ++--- detector/acfModify.m | 5 ++--- detector/acfTest.m | 5 ++--- detector/acfTrain.m | 5 ++--- detector/bbApply.m | 5 ++--- detector/bbGt.m | 5 ++--- detector/bbLabeler.m | 5 ++--- detector/bbNms.m | 5 ++--- detector/private/acfDetect1.cpp | 5 ++--- external/history.txt | 1 + external/toolboxCompile.m | 5 ++--- external/toolboxGenDoc.m | 9 ++++----- external/toolboxHeader.m | 5 ++--- external/toolboxUpdateHeader.m | 14 ++++++-------- filters/FbApply2d.m | 5 ++--- filters/FbCrop.m | 5 ++--- filters/FbMake.m | 5 ++--- filters/FbReconstruct2d.m | 5 ++--- filters/FbVisualize.m | 5 ++--- filters/filterBinomial1d.m | 5 ++--- filters/filterDog2d.m | 5 ++--- filters/filterDoog.m | 5 ++--- filters/filterGabor1d.m | 5 ++--- filters/filterGabor2d.m | 5 ++--- filters/filterGauss.m | 5 ++--- filters/filterSteerable.m | 5 ++--- filters/filterVisualize.m | 5 ++--- filters/medfilt1m.m | 5 ++--- filters/modefilt1.m | 5 ++--- images/assignToBins.m | 5 ++--- images/clusterMontage.m | 5 ++--- images/convnFast.m | 5 ++--- images/filmStrip.m | 5 ++--- images/gaussSmooth.m | 5 ++--- images/histMontage.m | 5 ++--- images/histc2.m | 5 ++--- images/histcImLoc.m | 5 ++--- images/histcImWin.m | 5 ++--- images/im.m | 5 ++--- images/imMlGauss.m | 5 ++--- images/imNormalize.m | 5 ++--- images/imRectRot.m | 5 ++--- images/imShrink.m | 5 ++--- images/imtransform2.m | 5 ++--- images/imwrite2.m | 5 ++--- images/jitterImage.m | 5 ++--- images/localSum.m | 5 ++--- images/makeGif.m | 5 ++--- images/maskCircle.m | 5 ++--- images/maskEllipse.m | 5 ++--- images/maskGaussians.m | 5 ++--- images/maskSphere.m | 5 ++--- images/montage2.m | 5 ++--- images/movieToImages.m | 5 ++--- images/nonMaxSupr.m | 5 ++--- images/nonMaxSuprList.m | 5 ++--- images/nonMaxSuprWin.m | 5 ++--- images/normxcorrn.m | 5 ++--- images/playMovie.m | 5 ++--- images/private/assignToBins1.c | 9 ++++----- images/private/histc2c.c | 9 ++++----- images/private/imtransform2_c.c | 5 ++--- images/private/nlfiltersep.m | 5 ++--- images/private/nlfiltersep_max.c | 9 ++++----- images/private/nlfiltersep_sum.c | 9 ++++----- images/textureMap.m | 5 ++--- images/xcorrn.m | 5 ++--- images/xeucn.m | 5 ++--- matlab/arrayCrop.m | 5 ++--- matlab/arrayToDims.m | 5 ++--- matlab/c.m | 5 ++--- matlab/cc.m | 5 ++--- matlab/ccc.m | 5 ++--- matlab/cell2array.m | 5 ++--- matlab/char2img.m | 5 ++--- matlab/checkNumArgs.m | 5 ++--- matlab/dijkstra.m | 5 ++--- matlab/dirSynch.m | 5 ++--- matlab/diskFill.m | 5 ++--- matlab/dispMatrixIm.m | 5 ++--- matlab/fevalArrays.m | 5 ++--- matlab/fevalDistr.m | 5 ++--- matlab/fevalDistrDisk.m | 5 ++--- matlab/fevalImages.m | 5 ++--- matlab/fevalMats.m | 5 ++--- matlab/figureResized.m | 5 ++--- matlab/gauss2ellipse.m | 5 ++--- matlab/getPrmDflt.m | 5 ++--- matlab/imLabel.m | 5 ++--- matlab/ind2sub2.m | 5 ++--- matlab/int2str2.m | 5 ++--- matlab/isfield2.m | 5 ++--- matlab/mat2cell2.m | 5 ++--- matlab/medianw.m | 5 ++--- matlab/multiDiv.m | 5 ++--- matlab/multiTimes.m | 5 ++--- matlab/normpdf2.m | 5 ++--- matlab/num2strs.m | 5 ++--- matlab/plotEllipse.m | 5 ++--- matlab/plotGaussEllipses.m | 5 ++--- matlab/plotRoc.m | 5 ++--- matlab/private/dijkstra1.cpp | 5 ++--- matlab/randSample.m | 5 ++--- matlab/randint2.m | 5 ++--- matlab/rotationMatrix.m | 5 ++--- matlab/simpleCache.m | 5 ++--- matlab/spBlkDiag.m | 5 ++--- matlab/sub2ind2.m | 5 ++--- matlab/subsToArray.m | 5 ++--- matlab/text2.m | 5 ++--- matlab/ticStatus.m | 5 ++--- matlab/tocStatus.m | 5 ++--- matlab/tpsGetWarp.m | 5 ++--- matlab/tpsInterpolate.m | 5 ++--- matlab/tpsInterpolateIm.m | 5 ++--- matlab/tpsRandom.m | 5 ++--- matlab/txt2img.m | 5 ++--- matlab/uniqueColors.m | 5 ++--- videos/behaviorAnnotator.m | 5 ++--- videos/behaviorData.m | 5 ++--- videos/imagesAlign.m | 5 ++--- videos/imagesAlignSeq.m | 5 ++--- videos/kernelTracker.m | 5 ++--- videos/opticalFlow.m | 5 ++--- videos/private/ktComputeW_c.c | 9 ++++----- videos/private/ktHistcRgb_c.c | 9 ++++----- videos/private/opticalFlowHsMex.cpp | 5 ++--- videos/seqIo.m | 5 ++--- videos/seqPlayer.m | 5 ++--- videos/seqReaderPlugin.m | 5 ++--- videos/seqWriterPlugin.m | 5 ++--- 193 files changed, 413 insertions(+), 605 deletions(-) diff --git a/channels/chnsCompute.m b/channels/chnsCompute.m index bafb3f33..c4394ba7 100644 --- a/channels/chnsCompute.m +++ b/channels/chnsCompute.m @@ -112,9 +112,8 @@ % % See also rgbConvert, gradientMag, gradientHist, chnsPyramid % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get default parameters pChns diff --git a/channels/chnsPyramid.m b/channels/chnsPyramid.m index 46bded48..86ad7e93 100644 --- a/channels/chnsPyramid.m +++ b/channels/chnsPyramid.m @@ -107,9 +107,8 @@ % % See also chnsCompute, chnsScaling, convTri, imPad % -% Piotr's Image&Video Toolbox Version 3.25 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.25 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get default parameters pPyramid diff --git a/channels/chnsScaling.m b/channels/chnsScaling.m index eff242f7..837cdd0a 100644 --- a/channels/chnsScaling.m +++ b/channels/chnsScaling.m @@ -44,9 +44,8 @@ % % See also chnsCompute, chnsPyramid, fevalImages % -% Piotr's Image&Video Toolbox Version 3.25 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.25 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get additional input arguments diff --git a/channels/convBox.m b/channels/convBox.m index 6a60aadd..b24f3fa0 100644 --- a/channels/convBox.m +++ b/channels/convBox.m @@ -51,9 +51,8 @@ % % See also conv2, convTri % -% Piotr's Image&Video Toolbox Version 3.02 -% Copyright 2012 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.02 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] assert( r>=0 ); diff --git a/channels/convMax.m b/channels/convMax.m index 9a96a291..9b55e6e0 100644 --- a/channels/convMax.m +++ b/channels/convMax.m @@ -36,9 +36,8 @@ % % See also conv2, convTri, convBox % -% Piotr's Image&Video Toolbox Version 3.00 -% Copyright 2012 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.00 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] assert( all(r>=0) ); diff --git a/channels/convTri.m b/channels/convTri.m index 687a0539..812d2c45 100644 --- a/channels/convTri.m +++ b/channels/convTri.m @@ -71,9 +71,8 @@ % % See also conv2, convBox, gaussSmooth % -% Piotr's Image&Video Toolbox Version 3.02 -% Copyright 2012 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.02 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 ), s=1; end diff --git a/channels/fhog.m b/channels/fhog.m index c0d5aff1..703b3547 100644 --- a/channels/fhog.m +++ b/channels/fhog.m @@ -53,9 +53,8 @@ % % See also hog, hogDraw, gradientHist % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 ), binSize=8; end diff --git a/channels/gradient2.m b/channels/gradient2.m index e4391b9d..808dde11 100644 --- a/channels/gradient2.m +++ b/channels/gradient2.m @@ -28,9 +28,8 @@ % % See also gradient, gradientMag % -% Piotr's Image&Video Toolbox Version 3.00 -% Copyright 2012 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.00 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] [Gx,Gy]=gradientMex('gradient2',I); diff --git a/channels/gradientHist.m b/channels/gradientHist.m index 7c3219ea..6bcfdf5e 100644 --- a/channels/gradientHist.m +++ b/channels/gradientHist.m @@ -62,9 +62,8 @@ % % See also gradientMag, gradient2, hog, fhog % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] H = gradientMex('gradientHist',M,O,varargin{:}); diff --git a/channels/gradientMag.m b/channels/gradientMag.m index 26e8c143..1e634cec 100644 --- a/channels/gradientMag.m +++ b/channels/gradientMag.m @@ -36,9 +36,8 @@ % % See also gradient, gradient2, gradientHist, convTri % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<1 || isempty(I)), M=single([]); O=M; return; end diff --git a/channels/hog.m b/channels/hog.m index 20297028..a8485e52 100644 --- a/channels/hog.m +++ b/channels/hog.m @@ -58,9 +58,8 @@ % % See also hogDraw, gradientHist % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 ), binSize=8; end diff --git a/channels/hogDraw.m b/channels/hogDraw.m index 3da04103..4abcb336 100644 --- a/channels/hogDraw.m +++ b/channels/hogDraw.m @@ -16,9 +16,8 @@ % % See also hog, fhog % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % fold normalizations diff --git a/channels/imPad.m b/channels/imPad.m index bd5437e1..af8ed32e 100644 --- a/channels/imPad.m +++ b/channels/imPad.m @@ -32,9 +32,8 @@ % % See also padarray % -% Piotr's Image&Video Toolbox Version 3.00 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.00 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] J = imPadMex( I, pad, type ); diff --git a/channels/imResample.m b/channels/imResample.m index 2262d8fc..ab6f96a9 100644 --- a/channels/imResample.m +++ b/channels/imResample.m @@ -29,9 +29,8 @@ % % See also imresize % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % figure out method and get target dimensions diff --git a/channels/private/chnsTestCpp.cpp b/channels/private/chnsTestCpp.cpp index f915f8a5..15124d1b 100644 --- a/channels/private/chnsTestCpp.cpp +++ b/channels/private/chnsTestCpp.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.00 -* Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.00 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include diff --git a/channels/private/convConst.cpp b/channels/private/convConst.cpp index a559fb5a..481974df 100644 --- a/channels/private/convConst.cpp +++ b/channels/private/convConst.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.24 -* Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.24 +* Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "wrappers.hpp" diff --git a/channels/private/gradientMex.cpp b/channels/private/gradientMex.cpp index e298621e..7011e9ef 100644 --- a/channels/private/gradientMex.cpp +++ b/channels/private/gradientMex.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version NEW -* Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version NEW +* Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "wrappers.hpp" diff --git a/channels/private/imPadMex.cpp b/channels/private/imPadMex.cpp index a9b94b4b..eabf38a2 100644 --- a/channels/private/imPadMex.cpp +++ b/channels/private/imPadMex.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.00 -* Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.00 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "wrappers.hpp" diff --git a/channels/private/imResampleMex.cpp b/channels/private/imResampleMex.cpp index 0a45c614..f5cae08f 100644 --- a/channels/private/imResampleMex.cpp +++ b/channels/private/imResampleMex.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.00 -* Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.00 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "wrappers.hpp" diff --git a/channels/private/rgbConvertMex.cpp b/channels/private/rgbConvertMex.cpp index 23fc8d4d..04132d98 100644 --- a/channels/private/rgbConvertMex.cpp +++ b/channels/private/rgbConvertMex.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.22 -* Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.22 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "wrappers.hpp" diff --git a/channels/private/sse.hpp b/channels/private/sse.hpp index f47ebd6b..a61dc22b 100644 --- a/channels/private/sse.hpp +++ b/channels/private/sse.hpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.23 -* Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.23 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #ifndef _SSE_HPP_ diff --git a/channels/private/wrappers.hpp b/channels/private/wrappers.hpp index c7e2be26..92226ec1 100644 --- a/channels/private/wrappers.hpp +++ b/channels/private/wrappers.hpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.00 -* Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.00 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #ifndef _WRAPPERS_HPP_ diff --git a/channels/rgbConvert.m b/channels/rgbConvert.m index ebaa9112..2ec8e4c4 100644 --- a/channels/rgbConvert.m +++ b/channels/rgbConvert.m @@ -66,9 +66,8 @@ % % See also rgb2hsv, rgb2gray % -% Piotr's Image&Video Toolbox Version 3.02 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.02 +% Copyright 2014 Piotr Dollar & Ron Appel. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3 || isempty(useSingle)), useSingle=true; end diff --git a/classify/adaBoostApply.m b/classify/adaBoostApply.m index 99179c07..2799f361 100644 --- a/classify/adaBoostApply.m +++ b/classify/adaBoostApply.m @@ -18,9 +18,8 @@ % % See also adaBoostTrain % -% Piotr's Image&Video Toolbox Version 3.21 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.21 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3 || isempty(maxDepth)), maxDepth=0; end diff --git a/classify/adaBoostTrain.m b/classify/adaBoostTrain.m index 61ef3b82..57cf5f3a 100644 --- a/classify/adaBoostTrain.m +++ b/classify/adaBoostTrain.m @@ -52,9 +52,8 @@ % % See also adaBoostApply, binaryTreeTrain, demoGenData % -% Piotr's Image&Video Toolbox Version 3.21 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.21 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get additional parameters diff --git a/classify/binaryTreeApply.m b/classify/binaryTreeApply.m index 9eb1190d..326c6976 100644 --- a/classify/binaryTreeApply.m +++ b/classify/binaryTreeApply.m @@ -18,9 +18,8 @@ % % See also binaryTreeTrain % -% Piotr's Image&Video Toolbox Version 3.21 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.21 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3 || isempty(maxDepth)), maxDepth=0; end diff --git a/classify/binaryTreeTrain.m b/classify/binaryTreeTrain.m index 9e2901c5..7dbe23ec 100644 --- a/classify/binaryTreeTrain.m +++ b/classify/binaryTreeTrain.m @@ -56,9 +56,8 @@ % % See also binaryTreeApply, adaBoostTrain, forestTrain % -% Piotr's Image&Video Toolbox Version 3.21 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.21 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get parameters diff --git a/classify/confMatrix.m b/classify/confMatrix.m index 3b78b375..1131aa5f 100644 --- a/classify/confMatrix.m +++ b/classify/confMatrix.m @@ -28,9 +28,8 @@ % % See also CONFMATRIXSHOW % -% Piotr's Image&Video Toolbox Version 2.12 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.12 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] IDXtrue=IDXtrue(:); IDXpred=IDXpred(:); diff --git a/classify/confMatrixShow.m b/classify/confMatrixShow.m index 9fa395da..8b567765 100644 --- a/classify/confMatrixShow.m +++ b/classify/confMatrixShow.m @@ -25,9 +25,8 @@ function confMatrixShow( CM, types, pvPairs, nDigits, showCnts ) % % See also confMatrix, imLabel, dispMatrixIm % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 ); types=[]; end diff --git a/classify/demoCluster.m b/classify/demoCluster.m index a10586af..8ce266cd 100644 --- a/classify/demoCluster.m +++ b/classify/demoCluster.m @@ -15,9 +15,8 @@ % % See also KMEANS2, MEANSHIFT % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %%% generate data diff --git a/classify/demoGenData.m b/classify/demoGenData.m index 4a595490..dd397fed 100644 --- a/classify/demoGenData.m +++ b/classify/demoGenData.m @@ -31,9 +31,8 @@ % % See also visualizeData, demoCluster % -% Piotr's Image&Video Toolbox Version 3.20 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.20 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % generate mixing weights and adjust n0 and n1 for noise fraction diff --git a/classify/distMatrixShow.m b/classify/distMatrixShow.m index 8ce4a89f..8c4eec79 100644 --- a/classify/distMatrixShow.m +++ b/classify/distMatrixShow.m @@ -28,9 +28,8 @@ % % See also VISUALIZEDATA, KMEANS2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(show) ); show=1; end diff --git a/classify/fernsClfApply.m b/classify/fernsClfApply.m index f50a4bf0..94302a8a 100644 --- a/classify/fernsClfApply.m +++ b/classify/fernsClfApply.m @@ -17,9 +17,8 @@ % % See also fernsClfTrain, fernsInds % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(inds) ) inds = fernsInds(data,ferns.fids,ferns.thrs); end diff --git a/classify/fernsClfTrain.m b/classify/fernsClfTrain.m index 058988da..2e3436dc 100644 --- a/classify/fernsClfTrain.m +++ b/classify/fernsClfTrain.m @@ -48,9 +48,8 @@ % % See also fernsClfApply, fernsInds % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get additional parameters and check dimensions diff --git a/classify/fernsInds.m b/classify/fernsInds.m index c0ae7ea4..cdfd747b 100644 --- a/classify/fernsInds.m +++ b/classify/fernsInds.m @@ -16,9 +16,8 @@ % % See also fernsClfTrain, fernsClfApply % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] inds = fernsInds1( data, fids, thrs ); diff --git a/classify/fernsRegApply.m b/classify/fernsRegApply.m index b9d9a0da..86fbd72a 100644 --- a/classify/fernsRegApply.m +++ b/classify/fernsRegApply.m @@ -17,9 +17,8 @@ % % See also fernsRegTrain, fernsInds % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(inds) ) inds = fernsInds(data,ferns.fids,ferns.thrs); end; [N,M]=size(inds); diff --git a/classify/fernsRegTrain.m b/classify/fernsRegTrain.m index 3d444b0e..1aa5903d 100644 --- a/classify/fernsRegTrain.m +++ b/classify/fernsRegTrain.m @@ -64,9 +64,8 @@ % % See also fernsRegApply, fernsInds % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get/check parameters diff --git a/classify/forestApply.m b/classify/forestApply.m index 7a5f18da..2f8c1dd1 100644 --- a/classify/forestApply.m +++ b/classify/forestApply.m @@ -19,9 +19,8 @@ % % See also forestTrain % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3 || isempty(maxDepth)), maxDepth=0; end if(nargin<4 || isempty(minCount)), minCount=0; end diff --git a/classify/forestTrain.m b/classify/forestTrain.m index ee2d81ea..09247226 100644 --- a/classify/forestTrain.m +++ b/classify/forestTrain.m @@ -53,9 +53,8 @@ % % See also forestApply, fernsClfTrain % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get additional parameters and fill in remaining parameters diff --git a/classify/kmeans2.m b/classify/kmeans2.m index 198193fe..202b8130 100644 --- a/classify/kmeans2.m +++ b/classify/kmeans2.m @@ -51,9 +51,8 @@ % % See also DEMOCLUSTER % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get input args diff --git a/classify/meanShift.m b/classify/meanShift.m index 02a98df2..b5127b90 100644 --- a/classify/meanShift.m +++ b/classify/meanShift.m @@ -43,9 +43,8 @@ % % See also MEANSHIFTIM, DEMOCLUSTER % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 ); rate =.2; end diff --git a/classify/meanShiftIm.m b/classify/meanShiftIm.m index 0724da42..fb82b1ec 100644 --- a/classify/meanShiftIm.m +++ b/classify/meanShiftIm.m @@ -57,9 +57,8 @@ % % See also MEANSHIFT, MEANSHIFTIMEXPLORE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] [sigSpt,er] = checkNumArgs( sigSpt, 1, 0, 1 ); error(er); diff --git a/classify/meanShiftImExplore.m b/classify/meanShiftImExplore.m index fe6cb73c..fbf47836 100644 --- a/classify/meanShiftImExplore.m +++ b/classify/meanShiftImExplore.m @@ -28,9 +28,8 @@ function meanShiftImExplore( I, X, sigSpt, sigRng, show ) % % See also MEANSHIFTIM % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<5 ); show = 1; end diff --git a/classify/pca.m b/classify/pca.m index 5fcea429..ab4d1055 100644 --- a/classify/pca.m +++ b/classify/pca.m @@ -43,9 +43,8 @@ % % See also princomp, pcaApply, pcaVisualize, pcaRandVec, visualizeData % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % set X to be zero mean, then flatten diff --git a/classify/pcaApply.m b/classify/pcaApply.m index 9bd1d65c..aa5bdc26 100644 --- a/classify/pcaApply.m +++ b/classify/pcaApply.m @@ -29,9 +29,8 @@ % % See also PCA, PCAVISUALIZE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % sizes / dimensions diff --git a/classify/pcaRandVec.m b/classify/pcaRandVec.m index 5ad19155..42dfcace 100644 --- a/classify/pcaRandVec.m +++ b/classify/pcaRandVec.m @@ -28,9 +28,8 @@ % % See also PCA IMNORMALIZE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<6 || isempty(hypershpere) ); hypershpere=0; end diff --git a/classify/pcaVisualize.m b/classify/pcaVisualize.m index 9decb105..a8a86001 100644 --- a/classify/pcaVisualize.m +++ b/classify/pcaVisualize.m @@ -27,9 +27,8 @@ % % See also PCA, PCAAPPLY % -% Piotr's Image&Video Toolbox Version 2.30 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.30 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % sizes / dimensions diff --git a/classify/pdist2.m b/classify/pdist2.m index 5bbed302..acc320a4 100644 --- a/classify/pdist2.m +++ b/classify/pdist2.m @@ -57,9 +57,8 @@ % % See also pdist, distMatrixShow % -% Piotr's Image&Video Toolbox Version 2.52 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.52 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(metric) ); metric=0; end; diff --git a/classify/private/IDX2order.m b/classify/private/IDX2order.m index 7b2f0a22..7f312a99 100644 --- a/classify/private/IDX2order.m +++ b/classify/private/IDX2order.m @@ -20,9 +20,8 @@ % % See also DISTMATRIXSHOW % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] k = max(IDX); n = length(IDX); diff --git a/classify/private/binaryTreeTrain1.cpp b/classify/private/binaryTreeTrain1.cpp index f63095d8..2d8389f3 100644 --- a/classify/private/binaryTreeTrain1.cpp +++ b/classify/private/binaryTreeTrain1.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.24 -* Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.24 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include diff --git a/classify/private/fernsInds1.c b/classify/private/fernsInds1.c index 3b8ad002..4ef60719 100644 --- a/classify/private/fernsInds1.c +++ b/classify/private/fernsInds1.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.50 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.50 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include "mex.h" #include typedef unsigned int uint; diff --git a/classify/private/forestFindThr.cpp b/classify/private/forestFindThr.cpp index c5a4a735..431d115d 100644 --- a/classify/private/forestFindThr.cpp +++ b/classify/private/forestFindThr.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.24 -* Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.24 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include @@ -14,12 +13,12 @@ typedef unsigned int uint32; #define entropy(p) (-p*flog2(float(p))) // fast approximate log2(x) from Paul Mineiro -inline float flog2( float x ) { - union { float f; uint32_t i; } vx = { x }; - union { uint32_t i; float f; } mx = { (vx.i & 0x007FFFFF) | 0x3f000000 }; - float y = float(vx.i); y *= 1.1920928955078125e-7f; - return y - 124.22551499f - 1.498030302f * mx.f - - 1.72587999f / (0.3520887068f + mx.f); +inline float flog2( float x ) { + union { float f; uint32_t i; } vx = { x }; + union { uint32_t i; float f; } mx = { (vx.i & 0x007FFFFF) | 0x3f000000 }; + float y = float(vx.i); y *= 1.1920928955078125e-7f; + return y - 124.22551499f - 1.498030302f * mx.f + - 1.72587999f / (0.3520887068f + mx.f); } // perform actual computation diff --git a/classify/private/forestInds.cpp b/classify/private/forestInds.cpp index 75ff4f01..03d5fee1 100644 --- a/classify/private/forestInds.cpp +++ b/classify/private/forestInds.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.24 -* Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.24 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include diff --git a/classify/private/meanShift1.c b/classify/private/meanShift1.c index 27a66ff0..6ad0dc28 100644 --- a/classify/private/meanShift1.c +++ b/classify/private/meanShift1.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.50 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.50 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include #include #include "mex.h" diff --git a/classify/private/meanShiftPost.m b/classify/private/meanShiftPost.m index b2bc6c75..0d0a0a36 100644 --- a/classify/private/meanShiftPost.m +++ b/classify/private/meanShiftPost.m @@ -14,9 +14,8 @@ % % See also MEANSHIFT, KMEANS2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %%% force outliers to belong to IDX (mainly for visualization) diff --git a/classify/rbfComputeBasis.m b/classify/rbfComputeBasis.m index 11c2513b..ef676ca2 100644 --- a/classify/rbfComputeBasis.m +++ b/classify/rbfComputeBasis.m @@ -54,9 +54,8 @@ % % See also RBFDEMO, RBFCOMPUTEFTRS % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 || isempty(k)); error('k not specified'); end diff --git a/classify/rbfComputeFtrs.m b/classify/rbfComputeFtrs.m index 812bcaba..c50493b9 100644 --- a/classify/rbfComputeFtrs.m +++ b/classify/rbfComputeFtrs.m @@ -17,9 +17,8 @@ % % See also RBFDEMO, RBFCOMPUTEBASIS % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % compute distance to each basis function diff --git a/classify/rbfDemo.m b/classify/rbfDemo.m index f046edd0..e8022aa1 100644 --- a/classify/rbfDemo.m +++ b/classify/rbfDemo.m @@ -25,9 +25,8 @@ function rbfDemo( dataType, noiseSig, scale, k, cluster, show ) % % See also RBFCOMPUTEBASIS, RBFCOMPUTEFTRS % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %%% generate trn/tst data diff --git a/classify/softMin.m b/classify/softMin.m index 3c495256..45a79560 100644 --- a/classify/softMin.m +++ b/classify/softMin.m @@ -41,9 +41,8 @@ % % See also PDIST2, SOFTMAX % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( sigma==0 ) % special case, make fast diff --git a/classify/visualizeData.m b/classify/visualizeData.m index 204b6c56..75cca341 100644 --- a/classify/visualizeData.m +++ b/classify/visualizeData.m @@ -26,9 +26,8 @@ function visualizeData( X, k, IDX, types, C ) % % See also KMEANS2, DEMOCLUSTER % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(IDX) ); IDX=[]; end diff --git a/detector/acfDemoCal.m b/detector/acfDemoCal.m index b95875ed..e89f4d88 100644 --- a/detector/acfDemoCal.m +++ b/detector/acfDemoCal.m @@ -12,9 +12,8 @@ % Note: pre-trained model files are provided (delete to re-train). % Re-training may give slightly variable results on different machines. % -% Piotr's Image&Video Toolbox Version 3.23 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.23 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %% extract training and testing images and ground truth diff --git a/detector/acfDemoInria.m b/detector/acfDemoInria.m index 3727e87e..b32ea02f 100644 --- a/detector/acfDemoInria.m +++ b/detector/acfDemoInria.m @@ -12,9 +12,8 @@ % Note: pre-trained model files are provided (delete to re-train). % Re-training may give slightly variable results on different machines. % -% Piotr's Image&Video Toolbox Version 3.22 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.22 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %% extract training and testing images and ground truth diff --git a/detector/acfDetect.m b/detector/acfDetect.m index 517c0df8..d000b213 100644 --- a/detector/acfDetect.m +++ b/detector/acfDetect.m @@ -31,9 +31,8 @@ % % See also acfTrain, acfModify, bbGt>loadAll, bbNms % -% Piotr's Image&Video Toolbox Version 3.20 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.20 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % run detector on every image diff --git a/detector/acfModify.m b/detector/acfModify.m index 5007eaaa..19f53bf8 100644 --- a/detector/acfModify.m +++ b/detector/acfModify.m @@ -39,9 +39,8 @@ % % See also chnsPyramid, bbNms, acfTrain, acfDetect % -% Piotr's Image&Video Toolbox Version 3.20 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.20 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get parameters (and copy to detector and pPyramid structs) diff --git a/detector/acfTest.m b/detector/acfTest.m index 6c73c847..bfa0fc3b 100644 --- a/detector/acfTest.m +++ b/detector/acfTest.m @@ -27,9 +27,8 @@ % % See also acfTrain, acfDetect, acfDemoInria, bbGt % -% Piotr's Image&Video Toolbox Version 3.22 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.22 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get parameters diff --git a/detector/acfTrain.m b/detector/acfTrain.m index 06be8a1b..3648a67d 100644 --- a/detector/acfTrain.m +++ b/detector/acfTrain.m @@ -105,9 +105,8 @@ % See also acfDetect, acfDemoInria, acfModify, acfTest, chnsCompute, % chnsPyramid, adaBoostTrain, bbGt, bbNms, jitterImage % -% Piotr's Image&Video Toolbox Version 3.25 -% Copyright 2013 Piotr Dollar & Ron Appel. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.25 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % initialize opts struct diff --git a/detector/bbApply.m b/detector/bbApply.m index a02fe540..b0ca6b26 100644 --- a/detector/bbApply.m +++ b/detector/bbApply.m @@ -58,9 +58,8 @@ % bbApply>union bbApply>resize bbApply>squarify bbApply>draw bbApply>crop % bbApply>convert bbApply>random bbApply>frMask bbApply>toMask % -% Piotr's Image&Video Toolbox Version NEW -% Copyright 2014 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% 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] %#ok<*DEFNU> diff --git a/detector/bbGt.m b/detector/bbGt.m index 7ad5512c..d6ce2f70 100644 --- a/detector/bbGt.m +++ b/detector/bbGt.m @@ -79,9 +79,8 @@ % bbGt>loadAll, bbGt>evalRes, bbGt>showRes, bbGt>compRoc, bbGt>cropRes, % bbGt>compOas, bbGt>compOa % -% Piotr's Image&Video Toolbox Version 3.26 -% Copyright 2014 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.26 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %#ok<*DEFNU> diff --git a/detector/bbLabeler.m b/detector/bbLabeler.m index c0133004..1aaf0692 100644 --- a/detector/bbLabeler.m +++ b/detector/bbLabeler.m @@ -18,9 +18,8 @@ function bbLabeler( objTypes, imgDir, resDir ) % % See also bbGt, imRectRot % -% Piotr's Image&Video Toolbox Version 2.66 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.66 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<1 || isempty(objTypes)), objTypes={'object'}; end diff --git a/detector/bbNms.m b/detector/bbNms.m index 7d8aef2e..e3f031cf 100644 --- a/detector/bbNms.m +++ b/detector/bbNms.m @@ -65,9 +65,8 @@ % % See also bbApply, nonMaxSuprList % -% Piotr's Image&Video Toolbox Version 2.60 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.60 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get parameters diff --git a/detector/private/acfDetect1.cpp b/detector/private/acfDetect1.cpp index 13fd0b9b..cfd80ae0 100644 --- a/detector/private/acfDetect1.cpp +++ b/detector/private/acfDetect1.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.21 -* Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.21 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "mex.h" diff --git a/external/history.txt b/external/history.txt index 701aefcd..d6c6f24a 100644 --- a/external/history.txt +++ b/external/history.txt @@ -1,4 +1,5 @@ Version NEW + -changed toolbox name to "Piotr's Computer Vision Matlab Toolbox" -added Mac binaries (mexmaci64) -gradientMex, rgbConvertMex, imtransform2_c: fixed compiler warnings on Mac -toolboxCompile: disable OMP on Mac by default (OMP is tricky to setup on Mac) diff --git a/external/toolboxCompile.m b/external/toolboxCompile.m index 477ced19..a2655628 100644 --- a/external/toolboxCompile.m +++ b/external/toolboxCompile.m @@ -17,9 +17,8 @@ % % See also % -% Piotr's Image&Video Toolbox Version NEW -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% 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] % compile options including openmp support for C++ files diff --git a/external/toolboxGenDoc.m b/external/toolboxGenDoc.m index df54b9df..ce784866 100644 --- a/external/toolboxGenDoc.m +++ b/external/toolboxGenDoc.m @@ -17,9 +17,8 @@ % % See also % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% 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] % Requires external/m2html to be in path. @@ -102,7 +101,7 @@ function postProcess( fName ) end function writeFile( fName, lines ) -fid = fopen( fName, 'wt' ); -for i=1:length(lines); fprintf( fid, '%s\n', lines{i} ); end +fid = fopen( fName, 'w' ); +for i=1:length(lines); fprintf( fid, '%s\r\n', lines{i} ); end fclose(fid); end diff --git a/external/toolboxHeader.m b/external/toolboxHeader.m index f743adb7..b9e6f448 100644 --- a/external/toolboxHeader.m +++ b/external/toolboxHeader.m @@ -45,9 +45,8 @@ % % See also GETPRMDFLT % -% Piotr's Image&Video Toolbox Version 2.10 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.10 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % optional arguments x3 and prm diff --git a/external/toolboxUpdateHeader.m b/external/toolboxUpdateHeader.m index 00ab827a..0ba10c7e 100644 --- a/external/toolboxUpdateHeader.m +++ b/external/toolboxUpdateHeader.m @@ -12,15 +12,13 @@ % % See also % -% Piotr's Image&Video Toolbox Version 3.26 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% 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] header={ - '% Piotr''s Image&Video Toolbox Version 3.26'; ... - '% Copyright 2014 Piotr Dollar. [pdollar-at-caltech.edu]'; ... - '% Please email me if you find bugs, or have suggestions or questions!'; ... + '% Piotr''s Computer Vision Matlab Toolbox Version 3.26'; ... + '% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com]'; ... '% Licensed under the Simplified BSD License [see external/bsd.txt]'}; % must start in /toolbox base directory @@ -72,7 +70,7 @@ function toolboxUpdateHeader1( fName, header ) end function writeFile( fName, lines ) -fid = fopen( fName, 'wt' ); -for i=1:length(lines); fprintf( fid, '%s\n', lines{i} ); end +fid = fopen( fName, 'w' ); +for i=1:length(lines); fprintf( fid, '%s\r\n', lines{i} ); end fclose(fid); end diff --git a/filters/FbApply2d.m b/filters/FbApply2d.m index 78879ff9..47c62491 100644 --- a/filters/FbApply2d.m +++ b/filters/FbApply2d.m @@ -22,9 +22,8 @@ % % See also CONV2, FBMAKE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(shape)); shape = 'full'; end diff --git a/filters/FbCrop.m b/filters/FbCrop.m index 42413419..b0418ebc 100644 --- a/filters/FbCrop.m +++ b/filters/FbCrop.m @@ -22,9 +22,8 @@ % % See also FBAPPLY2D % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nd = ndims(FB); diff --git a/filters/FbMake.m b/filters/FbMake.m index 5dba341c..c22cc7f0 100644 --- a/filters/FbMake.m +++ b/filters/FbMake.m @@ -27,9 +27,8 @@ % % See also FBAPPLY2D % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(show) ); show=0; end diff --git a/filters/FbReconstruct2d.m b/filters/FbReconstruct2d.m index 3453b852..a91d745a 100644 --- a/filters/FbReconstruct2d.m +++ b/filters/FbReconstruct2d.m @@ -28,9 +28,8 @@ % % See also FBAPPLY2D % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] FBmrows = size(FB,1); FBncols = size(FB,2); diff --git a/filters/FbVisualize.m b/filters/FbVisualize.m index ef1f32cc..09ee2021 100644 --- a/filters/FbVisualize.m +++ b/filters/FbVisualize.m @@ -19,9 +19,8 @@ function FbVisualize( FB, show ) % % See also FBAPPLY2D, FILTERVISUALIZE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 || isempty(show) ); show=1; end diff --git a/filters/filterBinomial1d.m b/filters/filterBinomial1d.m index ae20a460..2597ca69 100644 --- a/filters/filterBinomial1d.m +++ b/filters/filterBinomial1d.m @@ -26,9 +26,8 @@ % % See also FILTERGAUSS % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 ); show=0; end; diff --git a/filters/filterDog2d.m b/filters/filterDog2d.m index 32e0dc63..58c5f3d7 100644 --- a/filters/filterDog2d.m +++ b/filters/filterDog2d.m @@ -24,9 +24,8 @@ % % See also FILTERDOOG, FILTERGAUSS % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(show) ); show=0; end diff --git a/filters/filterDoog.m b/filters/filterDoog.m index 9f7660cc..79568384 100644 --- a/filters/filterDoog.m +++ b/filters/filterDoog.m @@ -24,9 +24,8 @@ % % See also FILTERGAUSS, NORMPDF2, FILTERDOG2D, FILTERGABOR2D % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nd = length( dims ); diff --git a/filters/filterGabor1d.m b/filters/filterGabor1d.m index 4db605bb..497a4fc6 100644 --- a/filters/filterGabor1d.m +++ b/filters/filterGabor1d.m @@ -19,9 +19,8 @@ % % See also FILTERGABOR2D % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(show) ); show=0; end; diff --git a/filters/filterGabor2d.m b/filters/filterGabor2d.m index 35338c9c..c4dbecd7 100644 --- a/filters/filterGabor2d.m +++ b/filters/filterGabor2d.m @@ -28,9 +28,8 @@ % % See also FILTERGABOR1D, FILTERGAUSS % -% Piotr's Image&Video Toolbox Version 2.12 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.12 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<5 || isempty(omega) ); omega=1; end diff --git a/filters/filterGauss.m b/filters/filterGauss.m index 6f6dae28..6dfc4419 100644 --- a/filters/filterGauss.m +++ b/filters/filterGauss.m @@ -31,9 +31,8 @@ % % See also NORMPDF2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nd = length( dims ); diff --git a/filters/filterSteerable.m b/filters/filterSteerable.m index 8ab69eb6..19856d59 100644 --- a/filters/filterSteerable.m +++ b/filters/filterSteerable.m @@ -18,9 +18,8 @@ function filterSteerable( theta ) % % See also filterGauss % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % Get G diff --git a/filters/filterVisualize.m b/filters/filterVisualize.m index 8ed0a98a..70f043d8 100644 --- a/filters/filterVisualize.m +++ b/filters/filterVisualize.m @@ -34,9 +34,8 @@ function filterVisualize( f, show, arg ) % % See also FILTERGAUSS, FBVISUALIZE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 || isempty(show) ); show=1; end; diff --git a/filters/medfilt1m.m b/filters/medfilt1m.m index 7999ee69..53184ef5 100644 --- a/filters/medfilt1m.m +++ b/filters/medfilt1m.m @@ -31,9 +31,8 @@ % % See also MODEFILT1, MEDFILT1 % -% Piotr's Image&Video Toolbox Version 2.35 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.35 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % apply medfilt1 (standard median filter) to valid locations in x diff --git a/filters/modefilt1.m b/filters/modefilt1.m index 58625f47..ffd9585b 100644 --- a/filters/modefilt1.m +++ b/filters/modefilt1.m @@ -28,9 +28,8 @@ % % See also MEDFILT1 % -% Piotr's Image&Video Toolbox Version 2.35 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.35 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get unique values in x diff --git a/images/assignToBins.m b/images/assignToBins.m index 6685521b..dccf7d6b 100644 --- a/images/assignToBins.m +++ b/images/assignToBins.m @@ -26,9 +26,8 @@ % % See also HISTC2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(~isa(A,'double')); A = double(A); end; diff --git a/images/clusterMontage.m b/images/clusterMontage.m index b7c4a136..82afcb5a 100644 --- a/images/clusterMontage.m +++ b/images/clusterMontage.m @@ -38,9 +38,8 @@ % % See also KMEANS2, MONTAGE2, PLAYMOVIE, CELL2ARRAY % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(pad) ); pad=1; end diff --git a/images/convnFast.m b/images/convnFast.m index 93ef3f03..578ac145 100644 --- a/images/convnFast.m +++ b/images/convnFast.m @@ -42,9 +42,8 @@ % % See also CONV2, CONVN % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(shape)); shape='full'; end diff --git a/images/filmStrip.m b/images/filmStrip.m index 37689c5e..04af29a3 100644 --- a/images/filmStrip.m +++ b/images/filmStrip.m @@ -23,9 +23,8 @@ % % See also MONTAGE2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % convert I to be of type double, and have dimensions MxNxCxTxR diff --git a/images/gaussSmooth.m b/images/gaussSmooth.m index 2f7accfc..bc2e6399 100644 --- a/images/gaussSmooth.m +++ b/images/gaussSmooth.m @@ -26,9 +26,8 @@ % % See also FILTERGAUSS % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nd = ndims(I); if(length(sigmas)==1); sigmas=repmat(sigmas,[1,nd]); end diff --git a/images/histMontage.m b/images/histMontage.m index dcad20f5..f5a0afc6 100644 --- a/images/histMontage.m +++ b/images/histMontage.m @@ -16,9 +16,8 @@ function histMontage( HS, mm, nn ) % % See also HISTC, HISTC2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] [nhist, nbins] = size(HS); diff --git a/images/histc2.m b/images/histc2.m index 52ee13bd..206faf7c 100644 --- a/images/histc2.m +++ b/images/histc2.m @@ -53,9 +53,8 @@ % % See also HISTC, ASSIGNTOBINS, BAR % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 ); wtMask=[]; end; diff --git a/images/histcImLoc.m b/images/histcImLoc.m index 7f71c90d..d083a984 100644 --- a/images/histcImLoc.m +++ b/images/histcImLoc.m @@ -49,9 +49,8 @@ % % See also HISTC2, MASKGAUSSIANS, ASSIGNTOBINS, HISTCIMWIN % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 ); wtMask=[]; end; diff --git a/images/histcImWin.m b/images/histcImWin.m index 3878dc07..55eb11b1 100644 --- a/images/histcImWin.m +++ b/images/histcImWin.m @@ -28,9 +28,8 @@ % % See also ASSIGNTOBINS, HISTC2, CONVNFAST, HISTCIMLOC % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(shape) ); shape = 'full'; end; diff --git a/images/im.m b/images/im.m index cea161d7..eed8a9a4 100644 --- a/images/im.m +++ b/images/im.m @@ -19,9 +19,8 @@ % % See also imshow, imview, impixelinfo, imtool, imagesc % -% Piotr's Image&Video Toolbox Version 2.41 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.41 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<1 || isempty(I)); I=0; end; if( nargin<2 || isempty(range)), range=[]; end diff --git a/images/imMlGauss.m b/images/imMlGauss.m index db3d620b..86790d68 100644 --- a/images/imMlGauss.m +++ b/images/imMlGauss.m @@ -51,9 +51,8 @@ % % See also GAUSS2ELLIPSE, PLOTGAUSSELLIPSES, MASKELLIPSE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 || isempty(symmFlag) ); symmFlag=0; end; diff --git a/images/imNormalize.m b/images/imNormalize.m index c6b8586e..10f19478 100644 --- a/images/imNormalize.m +++ b/images/imNormalize.m @@ -29,9 +29,8 @@ % % See also FEVALARRAYS % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if (isa(X,'uint8')); X = double(X); end diff --git a/images/imRectRot.m b/images/imRectRot.m index ce5d4223..fc0be42d 100644 --- a/images/imRectRot.m +++ b/images/imRectRot.m @@ -75,9 +75,8 @@ % % See also IMRECT, RECTANGLE, PATCH % -% Piotr's Image&Video Toolbox Version 2.51 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.51 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % global variables (shared by all functions below) diff --git a/images/imShrink.m b/images/imShrink.m index 13128aa5..0b8f10d7 100644 --- a/images/imShrink.m +++ b/images/imShrink.m @@ -26,9 +26,8 @@ % % See also imResample, localSum % -% Piotr's Image&Video Toolbox Version 3.00 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.00 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( all(ratios==1) ); return; end diff --git a/images/imtransform2.m b/images/imtransform2.m index 80af7afb..c4c29f62 100644 --- a/images/imtransform2.m +++ b/images/imtransform2.m @@ -59,9 +59,8 @@ % % See also TEXTUREMAP, INTERP2 % -% Piotr's Image&Video Toolbox Version 3.01 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.01 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % check and parse inputs diff --git a/images/imwrite2.m b/images/imwrite2.m index b6913dda..713c4170 100644 --- a/images/imwrite2.m +++ b/images/imwrite2.m @@ -54,9 +54,8 @@ % % See also FEVALIMAGES, FEVALARRAYS % -% Piotr's Image&Video Toolbox Version 2.30 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.30 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<5 || isempty(name) ); name='I'; end; diff --git a/images/jitterImage.m b/images/jitterImage.m index 8b9f8007..4bf60587 100644 --- a/images/jitterImage.m +++ b/images/jitterImage.m @@ -53,9 +53,8 @@ % % See also imtransform2 % -% Piotr's Image&Video Toolbox Version 2.65 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.65 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get additional parameters diff --git a/images/localSum.m b/images/localSum.m index 3a6bff3a..090411a4 100644 --- a/images/localSum.m +++ b/images/localSum.m @@ -34,9 +34,8 @@ % % See also convBox, convMax, imShrink % -% Piotr's Image&Video Toolbox Version 3.22 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.22 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(shape)), shape='full'; end diff --git a/images/makeGif.m b/images/makeGif.m index 44360e9c..ae2b838a 100644 --- a/images/makeGif.m +++ b/images/makeGif.m @@ -22,9 +22,8 @@ function makeGif( M, fileName, prm ) % % See also PLAYMOVIE, MONTAGE2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] dfs = {'fps',30, 'nColor',256, 'scale',1, 'loop', 0}; diff --git a/images/maskCircle.m b/images/maskCircle.m index a24d4e12..59026e7d 100644 --- a/images/maskCircle.m +++ b/images/maskCircle.m @@ -34,9 +34,8 @@ % % See also MASKELLIPSE, MASKSPHERE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(nSamples) ); nSamples = 1; end diff --git a/images/maskEllipse.m b/images/maskEllipse.m index 47c30ddc..f64b1089 100644 --- a/images/maskEllipse.m +++ b/images/maskEllipse.m @@ -37,9 +37,8 @@ % % See also PLOTELLIPSE, GAUSS2ELLIPSE, MASKCIRCLE, MASKGAUSSIANS, IMMLGAUSS % -% Piotr's Image&Video Toolbox Version 2.40 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.40 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin==7 ) diff --git a/images/maskGaussians.m b/images/maskGaussians.m index 137b0b24..2bdc7d5c 100644 --- a/images/maskGaussians.m +++ b/images/maskGaussians.m @@ -46,9 +46,8 @@ % % See also HISTCIMLOC, MASKCIRCLE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nd = length(siz); diff --git a/images/maskSphere.m b/images/maskSphere.m index 7cdb2916..cc34f4b4 100644 --- a/images/maskSphere.m +++ b/images/maskSphere.m @@ -29,9 +29,8 @@ % % See also MASKCIRCLE, MONTAGE2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(show) ); show = 1; end diff --git a/images/montage2.m b/images/montage2.m index 94a0af1a..7b724fff 100644 --- a/images/montage2.m +++ b/images/montage2.m @@ -55,9 +55,8 @@ % % See also MONTAGE, PLAYMOVIE, FILMSTRIP % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 ); prm=struct(); end diff --git a/images/movieToImages.m b/images/movieToImages.m index 9c9ae5f3..a868bac0 100644 --- a/images/movieToImages.m +++ b/images/movieToImages.m @@ -19,9 +19,8 @@ % % See also PLAYMOVIE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] I = fevalArrays( M, @frame2Ii ); diff --git a/images/nonMaxSupr.m b/images/nonMaxSupr.m index 9c86cbdc..1691275f 100644 --- a/images/nonMaxSupr.m +++ b/images/nonMaxSupr.m @@ -58,9 +58,8 @@ % % See also SUBSTOARRAY, NONMAXSUPRLIST, NONMAXSUPRWIN % -% Piotr's Image&Video Toolbox Version 2.12 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.12 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % default values [error checking done by nlfiltersep_max] diff --git a/images/nonMaxSuprList.m b/images/nonMaxSuprList.m index c523a5ae..b98dca81 100644 --- a/images/nonMaxSuprList.m +++ b/images/nonMaxSuprList.m @@ -36,9 +36,8 @@ % % See also SUBSTOARRAY, NONMAXSUPR, NONMAXSUPRWIN % -% Piotr's Image&Video Toolbox Version 2.12 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.12 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(thresh)); thresh=[]; end; diff --git a/images/nonMaxSuprWin.m b/images/nonMaxSuprWin.m index c54610ca..e68cf239 100644 --- a/images/nonMaxSuprWin.m +++ b/images/nonMaxSuprWin.m @@ -29,9 +29,8 @@ % % See also SUBSTOARRAY, NONMAXSUPR, NONMAXSUPRLIST % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] vals = vals(:); nvals = length(vals); nd=size(subs,2); diff --git a/images/normxcorrn.m b/images/normxcorrn.m index 99b9f1ea..8cf5da4a 100644 --- a/images/normxcorrn.m +++ b/images/normxcorrn.m @@ -35,9 +35,8 @@ % % See also XEUCN, XCORRN, CONVNFAST % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(shape)); shape='full'; end diff --git a/images/playMovie.m b/images/playMovie.m index d764ca7e..909c7394 100644 --- a/images/playMovie.m +++ b/images/playMovie.m @@ -56,9 +56,8 @@ % % See also MONTAGE2, MOVIETOIMAGES, MOVIE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 || isempty(fps)); fps = 100; end diff --git a/images/private/assignToBins1.c b/images/private/assignToBins1.c index 46af6b03..e2c32e43 100644 --- a/images/private/assignToBins1.c +++ b/images/private/assignToBins1.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.2 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.2 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +*************************************************************************/ #include "mex.h" /************************************************************************** diff --git a/images/private/histc2c.c b/images/private/histc2c.c index 8b468509..334055fd 100644 --- a/images/private/histc2c.c +++ b/images/private/histc2c.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.2 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.2 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include "mex.h" /************************************************************************** diff --git a/images/private/imtransform2_c.c b/images/private/imtransform2_c.c index d1f21067..3698120b 100644 --- a/images/private/imtransform2_c.c +++ b/images/private/imtransform2_c.c @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version NEW -* Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* 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] *******************************************************************************/ #include "mex.h" diff --git a/images/private/nlfiltersep.m b/images/private/nlfiltersep.m index 7dbbd481..a2eefc04 100644 --- a/images/private/nlfiltersep.m +++ b/images/private/nlfiltersep.m @@ -47,9 +47,8 @@ % % See also NLFILTER, LOCALSUM % -% Piotr's Image&Video Toolbox Version 2.53 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.53 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] params=varargin; nd=ndims(I); siz=size(I); diff --git a/images/private/nlfiltersep_max.c b/images/private/nlfiltersep_max.c index a6c83019..301bcd73 100644 --- a/images/private/nlfiltersep_max.c +++ b/images/private/nlfiltersep_max.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.2 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.2 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include "mex.h" #define arraymax(A, m, s, e, i) m=A[s]; for(i=s+1; i<=e; i++) { m=((A[i])>(m)?(A[i]):(m)); }; diff --git a/images/private/nlfiltersep_sum.c b/images/private/nlfiltersep_sum.c index 1c224df1..31e5ebbd 100644 --- a/images/private/nlfiltersep_sum.c +++ b/images/private/nlfiltersep_sum.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.2 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.2 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include "mex.h" #define arraysum(A, m, s, e, i) m=0; for(i=s; i<=e; i++) { m+=A[i]; }; diff --git a/images/textureMap.m b/images/textureMap.m index 97b2dabe..fcc2ddfc 100644 --- a/images/textureMap.m +++ b/images/textureMap.m @@ -46,9 +46,8 @@ % % See also IMTRANSFORM2 % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<4 || isempty(bbox)), bbox='loose'; end diff --git a/images/xcorrn.m b/images/xcorrn.m index e39ef0b7..f1da041c 100644 --- a/images/xcorrn.m +++ b/images/xcorrn.m @@ -28,9 +28,8 @@ % % See also XCORR2, NORMXCORRN, XEUCN, CONVNFAST % -% Piotr's Image&Video Toolbox Version 2.12 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.12 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(shape)); shape='full'; end diff --git a/images/xeucn.m b/images/xeucn.m index 0117d78d..2d6b95db 100644 --- a/images/xeucn.m +++ b/images/xeucn.m @@ -23,9 +23,8 @@ % % See also XCORRN, CONVNFAST % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(shape)); shape='full'; end diff --git a/matlab/arrayCrop.m b/matlab/arrayCrop.m index 41cd8957..4d886b03 100644 --- a/matlab/arrayCrop.m +++ b/matlab/arrayCrop.m @@ -21,9 +21,8 @@ % % See also PADARRAY, ARRAYTODIMS % -% Piotr's Image&Video Toolbox Version 2.02 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.02 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(padEl)); padEl=0; end diff --git a/matlab/arrayToDims.m b/matlab/arrayToDims.m index dd62b120..3ae81399 100644 --- a/matlab/arrayToDims.m +++ b/matlab/arrayToDims.m @@ -23,9 +23,8 @@ % % See also ARRAYCROP, PADARRAY % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(padEl)); padEl=0; end diff --git a/matlab/c.m b/matlab/c.m index 6c904122..e91aa417 100644 --- a/matlab/c.m +++ b/matlab/c.m @@ -11,9 +11,8 @@ % % See also CLC, CC, CCC % -% Piotr's Image&Video Toolbox Version 1.5 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 1.5 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] clc diff --git a/matlab/cc.m b/matlab/cc.m index a31f98b9..dd7bb11f 100644 --- a/matlab/cc.m +++ b/matlab/cc.m @@ -11,9 +11,8 @@ % % See also C, CCC % -% Piotr's Image&Video Toolbox Version 1.5 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 1.5 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] close all; clc diff --git a/matlab/ccc.m b/matlab/ccc.m index 66a5bdf8..ae7c9cc4 100644 --- a/matlab/ccc.m +++ b/matlab/ccc.m @@ -11,9 +11,8 @@ % % See also C, CC % -% Piotr's Image&Video Toolbox Version 1.5 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 1.5 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] clear; close all; clc; clear all; diff --git a/matlab/cell2array.m b/matlab/cell2array.m index 03f577b7..6622d81d 100644 --- a/matlab/cell2array.m +++ b/matlab/cell2array.m @@ -25,9 +25,8 @@ % % See also MAT2CELL2, CELL2MAT % -% Piotr's Image&Video Toolbox Version 2.40 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.40 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(~iscell(X)); error('X must be a cell array'); end diff --git a/matlab/char2img.m b/matlab/char2img.m index 7480c157..03d7324e 100644 --- a/matlab/char2img.m +++ b/matlab/char2img.m @@ -25,9 +25,8 @@ % % See also TXT2IMG % -% Piotr's Image&Video Toolbox Version 2.65 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.65 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % load or create character templates (or simply store persistently) diff --git a/matlab/checkNumArgs.m b/matlab/checkNumArgs.m index cfeb6c28..242874f2 100644 --- a/matlab/checkNumArgs.m +++ b/matlab/checkNumArgs.m @@ -38,9 +38,8 @@ % % See also NARGCHK % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] xname = inputname(1); er=''; diff --git a/matlab/dijkstra.m b/matlab/dijkstra.m index cc1977f9..0c821947 100644 --- a/matlab/dijkstra.m +++ b/matlab/dijkstra.m @@ -26,9 +26,8 @@ % % See also % -% Piotr's Image&Video Toolbox Version 3.20 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.20 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] [D,P] = dijkstra1( G, varargin{:} ); diff --git a/matlab/dirSynch.m b/matlab/dirSynch.m index 686173bd..7bca3bf1 100644 --- a/matlab/dirSynch.m +++ b/matlab/dirSynch.m @@ -37,9 +37,8 @@ function dirSynch( root1, root2, showOnly, flag, ignDate ) % % See also % -% Piotr's Image&Video Toolbox Version 2.10 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.10 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3 || isempty(showOnly)), showOnly=1; end; diff --git a/matlab/diskFill.m b/matlab/diskFill.m index abb843c3..6bb3fe2d 100644 --- a/matlab/diskFill.m +++ b/matlab/diskFill.m @@ -15,9 +15,8 @@ function diskFill( tDir, nGig ) % % See also % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nm = sprintf('%s/garbage_%s_%05i_%%05i.mat',tDir,date,round(rand*10^5)); diff --git a/matlab/dispMatrixIm.m b/matlab/dispMatrixIm.m index 9c518cbc..8d587d14 100644 --- a/matlab/dispMatrixIm.m +++ b/matlab/dispMatrixIm.m @@ -25,9 +25,8 @@ function dispMatrixIm( M, varargin ) % % See also imLabel, confMatrixShow % -% Piotr's Image&Video Toolbox Version 2.62 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.62 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get default parameters diff --git a/matlab/fevalArrays.m b/matlab/fevalArrays.m index 6ba17213..685b1962 100644 --- a/matlab/fevalArrays.m +++ b/matlab/fevalArrays.m @@ -40,9 +40,8 @@ % See also FEVALIMAGES, FEVALMATS, ARRAYFUN % IMWRITE2, PERSISTENT, TICSTATUS, % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] nd = ndims(A); siz = size(A); n = siz(end); diff --git a/matlab/fevalDistr.m b/matlab/fevalDistr.m index 2d3d131b..016abe2f 100644 --- a/matlab/fevalDistr.m +++ b/matlab/fevalDistr.m @@ -69,9 +69,8 @@ % % See also matlabpool mcc % -% Piotr's Image&Video Toolbox Version 3.26 -% Copyright 2014 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.26 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] dfs={'type','local','pLaunch',[],'group',1}; [type,pLaunch,group]=getPrmDflt(varargin,dfs,1); store=(nargout==2); diff --git a/matlab/fevalDistrDisk.m b/matlab/fevalDistrDisk.m index ed17a9ae..2122c7bc 100644 --- a/matlab/fevalDistrDisk.m +++ b/matlab/fevalDistrDisk.m @@ -12,9 +12,8 @@ function fevalDistrDisk( funNm, jobDir, jobId ) % % See also fevalDistr % -% Piotr's Image&Video Toolbox Version 3.02 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.02 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] jobId=[jobDir int2str2(str2double(jobId),10)]; fIn=[jobId '-in.mat']; if(exist(fIn,'file')~=2), return; end diff --git a/matlab/fevalImages.m b/matlab/fevalImages.m index ba01b835..c7e5469d 100644 --- a/matlab/fevalImages.m +++ b/matlab/fevalImages.m @@ -57,9 +57,8 @@ % % See also FEVALARRAYS, IMWRITE2, PERSISTENT, TICSTATUS % -% Piotr's Image&Video Toolbox Version 2.40 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.40 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] narginchk( 3, 8 ); diff --git a/matlab/fevalMats.m b/matlab/fevalMats.m index 0e358ac3..2caae889 100644 --- a/matlab/fevalMats.m +++ b/matlab/fevalMats.m @@ -34,9 +34,8 @@ % % See also FEVALIMAGES, FEVALARRAYS, DEAL % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] narginchk( 4, 5 ); diff --git a/matlab/figureResized.m b/matlab/figureResized.m index bf9b8970..798b451e 100644 --- a/matlab/figureResized.m +++ b/matlab/figureResized.m @@ -19,9 +19,8 @@ % % See also FIGURE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<1 ); screenratio=.3; end diff --git a/matlab/gauss2ellipse.m b/matlab/gauss2ellipse.m index f174ff2b..41d37391 100644 --- a/matlab/gauss2ellipse.m +++ b/matlab/gauss2ellipse.m @@ -25,9 +25,8 @@ % % See also PLOTELLIPSE, PLOTGAUSSELLIPSES, MASKELLIPSE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if (nargin<3 || isempty(rad) ); rad=2; end; diff --git a/matlab/getPrmDflt.m b/matlab/getPrmDflt.m index 36821c3e..953f259c 100644 --- a/matlab/getPrmDflt.m +++ b/matlab/getPrmDflt.m @@ -34,9 +34,8 @@ % % See also INPUTPARSER % -% Piotr's Image&Video Toolbox Version 2.60 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.60 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( mod(length(dfs),2) ), error('odd number of default parameters'); end diff --git a/matlab/imLabel.m b/matlab/imLabel.m index 41209919..8c9bc400 100644 --- a/matlab/imLabel.m +++ b/matlab/imLabel.m @@ -19,9 +19,8 @@ function imLabel( labels, position, S, pvPairs ) % % See also MONTAGE2, TEXT2, TEXT % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(S) ); S=0; end diff --git a/matlab/ind2sub2.m b/matlab/ind2sub2.m index 471bbea2..259a3903 100644 --- a/matlab/ind2sub2.m +++ b/matlab/ind2sub2.m @@ -21,9 +21,8 @@ % % See also IND2SUB, SUB2IND2 % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( any(ind>prod(siz)) ); error('index out of range'); end diff --git a/matlab/int2str2.m b/matlab/int2str2.m index 39e7f89f..affdc64b 100644 --- a/matlab/int2str2.m +++ b/matlab/int2str2.m @@ -21,9 +21,8 @@ % % See also INT2STR % -% Piotr's Image&Video Toolbox Version 1.5 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 1.5 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<2 ); nDigits=0; end diff --git a/matlab/isfield2.m b/matlab/isfield2.m index 73e540fc..77f9a7b7 100644 --- a/matlab/isfield2.m +++ b/matlab/isfield2.m @@ -24,9 +24,8 @@ % % See also ISFIELD % -% Piotr's Image&Video Toolbox Version 2.10 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.10 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] tf = all( isfield(S,fs) ); diff --git a/matlab/mat2cell2.m b/matlab/mat2cell2.m index f1886df0..751c50f5 100644 --- a/matlab/mat2cell2.m +++ b/matlab/mat2cell2.m @@ -27,9 +27,8 @@ % % See also MAT2CELL, CELL2ARRAY, CELL2MAT % -% Piotr's Image&Video Toolbox Version 3.02 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.02 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] siz = size(X); nd = ndims(X); diff --git a/matlab/medianw.m b/matlab/medianw.m index c2d9c4b1..4644c6ef 100644 --- a/matlab/medianw.m +++ b/matlab/medianw.m @@ -29,9 +29,8 @@ % % See also median % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3), dim=find(size(x)~=1,1); end diff --git a/matlab/multiDiv.m b/matlab/multiDiv.m index 796d6e1c..8efcf2a8 100644 --- a/matlab/multiDiv.m +++ b/matlab/multiDiv.m @@ -41,9 +41,8 @@ % % See also MULTITIMES, SPBLKDIAG % -% Piotr's Image&Video Toolbox Version 2.40 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.40 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] ma = size(A,1); na = size(A,2); oa = size(A,3); diff --git a/matlab/multiTimes.m b/matlab/multiTimes.m index de77fc51..f3288b75 100644 --- a/matlab/multiTimes.m +++ b/matlab/multiTimes.m @@ -32,9 +32,8 @@ % % See also BSXFUN, MTIMES % -% Piotr's Image&Video Toolbox Version 2.52 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.52 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] ma = size(A,1); na = size(A,2); oa = size(A,3); diff --git a/matlab/normpdf2.m b/matlab/normpdf2.m index 2728ef6c..a038908e 100644 --- a/matlab/normpdf2.m +++ b/matlab/normpdf2.m @@ -22,9 +22,8 @@ % % See also NORMPDF % -% Piotr's Image&Video Toolbox Version 2.30 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.30 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get dimensions of data diff --git a/matlab/num2strs.m b/matlab/num2strs.m index ddfc3168..e60de9c7 100644 --- a/matlab/num2strs.m +++ b/matlab/num2strs.m @@ -16,9 +16,8 @@ % % See also NUM2STR % -% Piotr's Image&Video Toolbox Version 1.5 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 1.5 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] Y = cell(size(X)); diff --git a/matlab/plotEllipse.m b/matlab/plotEllipse.m index d9b9dd3e..724b7593 100644 --- a/matlab/plotEllipse.m +++ b/matlab/plotEllipse.m @@ -25,9 +25,8 @@ % % See also plotGaussEllipses % -% Piotr's Image&Video Toolbox Version 2.42 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.42 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] narginchk( 5, 9 ); diff --git a/matlab/plotGaussEllipses.m b/matlab/plotGaussEllipses.m index a7f2c8f3..466ac1bc 100644 --- a/matlab/plotGaussEllipses.m +++ b/matlab/plotGaussEllipses.m @@ -17,9 +17,8 @@ % % See also PLOTELLIPSE, GAUSS2ELLIPSE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if (nargin<3 || isempty(rad) ); rad=2; end diff --git a/matlab/plotRoc.m b/matlab/plotRoc.m index 5a6b60ed..2d8b8374 100644 --- a/matlab/plotRoc.m +++ b/matlab/plotRoc.m @@ -45,9 +45,8 @@ % % See also % -% Piotr's Image&Video Toolbox Version 3.02 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.02 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get params diff --git a/matlab/private/dijkstra1.cpp b/matlab/private/dijkstra1.cpp index de672c33..717c1d11 100644 --- a/matlab/private/dijkstra1.cpp +++ b/matlab/private/dijkstra1.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.20 -* Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.20 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ diff --git a/matlab/randSample.m b/matlab/randSample.m index 546279ec..a1b481f4 100644 --- a/matlab/randSample.m +++ b/matlab/randSample.m @@ -23,9 +23,8 @@ % % See also randperm % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 ), isArray=0; end diff --git a/matlab/randint2.m b/matlab/randint2.m index 6841d0d9..41ee9540 100644 --- a/matlab/randint2.m +++ b/matlab/randint2.m @@ -26,9 +26,8 @@ % % See also RANDINT % -% Piotr's Image&Video Toolbox Version 2.12 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.12 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] R = rand( m, n ); diff --git a/matlab/rotationMatrix.m b/matlab/rotationMatrix.m index 39599bc9..01989843 100644 --- a/matlab/rotationMatrix.m +++ b/matlab/rotationMatrix.m @@ -88,9 +88,8 @@ % % See also % -% Piotr's Image&Video Toolbox Version 2.35 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.35 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %%% Find the closest orthonormal matrix diff --git a/matlab/simpleCache.m b/matlab/simpleCache.m index 96150823..9d069d2b 100644 --- a/matlab/simpleCache.m +++ b/matlab/simpleCache.m @@ -44,9 +44,8 @@ % % See also PERSISTENT, MASKGAUSSIANS % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] switch op diff --git a/matlab/spBlkDiag.m b/matlab/spBlkDiag.m index c23a3af3..88ecc7db 100644 --- a/matlab/spBlkDiag.m +++ b/matlab/spBlkDiag.m @@ -25,9 +25,8 @@ % % See also SPARSE, BLKDIAG % -% Piotr's Image&Video Toolbox Version 2.35 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.35 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] [m,n,k]=size(A); diff --git a/matlab/sub2ind2.m b/matlab/sub2ind2.m index d4f71527..9e5c65f9 100644 --- a/matlab/sub2ind2.m +++ b/matlab/sub2ind2.m @@ -22,9 +22,8 @@ % % See also SUB2IND, IND2SUB2, SUBSTOARRAY % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(isempty(sub)); ind=[]; return; end; diff --git a/matlab/subsToArray.m b/matlab/subsToArray.m index 4fffa0e0..a7d647f3 100644 --- a/matlab/subsToArray.m +++ b/matlab/subsToArray.m @@ -21,9 +21,8 @@ % % See also SUB2IND2, SPARSE % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(fillVal) ); fillVal=0; end diff --git a/matlab/text2.m b/matlab/text2.m index 617a708b..f486df72 100644 --- a/matlab/text2.m +++ b/matlab/text2.m @@ -26,9 +26,8 @@ % % See also TEXT, IMLABEL % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %%% call text normally diff --git a/matlab/ticStatus.m b/matlab/ticStatus.m index 42cc96f4..204a6eaf 100644 --- a/matlab/ticStatus.m +++ b/matlab/ticStatus.m @@ -58,9 +58,8 @@ % % See also TOCSTATUS, TIC, TOC % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] global TT_STATUS TT_FREE_IDS diff --git a/matlab/tocStatus.m b/matlab/tocStatus.m index db837e0f..cd01ea1c 100644 --- a/matlab/tocStatus.m +++ b/matlab/tocStatus.m @@ -16,9 +16,8 @@ function tocStatus( id, fracDone ) % % See also TICSTATUS % -% Piotr's Image&Video Toolbox Version 2.50 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.50 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] global TT_STATUS TT_FREE_IDS diff --git a/matlab/tpsGetWarp.m b/matlab/tpsGetWarp.m index 20f83e83..ba9e7dc4 100644 --- a/matlab/tpsGetWarp.m +++ b/matlab/tpsGetWarp.m @@ -36,9 +36,8 @@ % % See also TPSINTERPOLATE, TPSINTERPOLATEIM, TPSRANDOM % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] dim = size( xsS ); diff --git a/matlab/tpsInterpolate.m b/matlab/tpsInterpolate.m index ac325618..8edea591 100644 --- a/matlab/tpsInterpolate.m +++ b/matlab/tpsInterpolate.m @@ -16,9 +16,8 @@ % % See also TPSGETWARP % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<4 || isempty(show)); show = 1; end diff --git a/matlab/tpsInterpolateIm.m b/matlab/tpsInterpolateIm.m index 347218d1..c1d7de53 100644 --- a/matlab/tpsInterpolateIm.m +++ b/matlab/tpsInterpolateIm.m @@ -23,9 +23,8 @@ % % See also TPSGETWARP, TEXTUREMAP % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if( nargin<3 || isempty(holeVal) ); holeVal=0; end diff --git a/matlab/tpsRandom.m b/matlab/tpsRandom.m index 1131f7dc..accd8896 100644 --- a/matlab/tpsRandom.m +++ b/matlab/tpsRandom.m @@ -15,9 +15,8 @@ % % See also TPSGETWARP % -% Piotr's Image&Video Toolbox Version 2.0 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.0 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] n = size(LnInv,1); diff --git a/matlab/txt2img.m b/matlab/txt2img.m index 706e3edb..76ddb0ee 100644 --- a/matlab/txt2img.m +++ b/matlab/txt2img.m @@ -23,9 +23,8 @@ % % See also CHAR2IMG, GETFRAME, TEXT % -% Piotr's Image&Video Toolbox Version 2.35 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.35 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % set up blank figure to which to write text diff --git a/matlab/uniqueColors.m b/matlab/uniqueColors.m index 39c22919..aaca4f85 100644 --- a/matlab/uniqueColors.m +++ b/matlab/uniqueColors.m @@ -30,9 +30,8 @@ % % See also hsv2rgb, colormap, hsv, jet % -% Piotr's Image&Video Toolbox Version 2.51 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.51 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<3 || isempty(show)), show=0; end diff --git a/videos/behaviorAnnotator.m b/videos/behaviorAnnotator.m index bba0cc67..c7f263c0 100644 --- a/videos/behaviorAnnotator.m +++ b/videos/behaviorAnnotator.m @@ -29,9 +29,8 @@ function behaviorAnnotator( fName, aName, tName ) % % See also behaviorData, seqIo % -% Piotr's Image&Video Toolbox Version 2.60 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.60 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % handles to gui objects / other globals diff --git a/videos/behaviorData.m b/videos/behaviorData.m index 7b8ca266..abdeff1b 100644 --- a/videos/behaviorData.m +++ b/videos/behaviorData.m @@ -92,9 +92,8 @@ % % See also behaviorAnnotator % -% Piotr's Image&Video Toolbox Version 2.60 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.60 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % fields for storing annotation diff --git a/videos/imagesAlign.m b/videos/imagesAlign.m index 5890f2df..02dad1c0 100644 --- a/videos/imagesAlign.m +++ b/videos/imagesAlign.m @@ -68,9 +68,8 @@ % % See also imTransform2 % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get parameters diff --git a/videos/imagesAlignSeq.m b/videos/imagesAlignSeq.m index d161a2d1..51610bb9 100644 --- a/videos/imagesAlignSeq.m +++ b/videos/imagesAlignSeq.m @@ -51,9 +51,8 @@ % % See also opticalFlow, imtransform2, imagesAlign % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % default parameters diff --git a/videos/kernelTracker.m b/videos/kernelTracker.m index c45c123b..21395f0b 100644 --- a/videos/kernelTracker.m +++ b/videos/kernelTracker.m @@ -54,9 +54,8 @@ % % See also % -% Piotr's Image&Video Toolbox Version 3.22 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.22 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] %%% get parameters (set defaults) diff --git a/videos/opticalFlow.m b/videos/opticalFlow.m index 6ed01951..208d653b 100644 --- a/videos/opticalFlow.m +++ b/videos/opticalFlow.m @@ -63,9 +63,8 @@ % % See also convTri, imtransform2, medfilt2 % -% Piotr's Image&Video Toolbox Version 3.24 -% Copyright 2013 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.24 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % get default parameters and do error checking diff --git a/videos/private/ktComputeW_c.c b/videos/private/ktComputeW_c.c index 98713b49..f61f2175 100644 --- a/videos/private/ktComputeW_c.c +++ b/videos/private/ktComputeW_c.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.2 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.2 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include "mex.h" #include "math.h" typedef unsigned char uchar; diff --git a/videos/private/ktHistcRgb_c.c b/videos/private/ktHistcRgb_c.c index 55b81e8f..de552b8a 100644 --- a/videos/private/ktHistcRgb_c.c +++ b/videos/private/ktHistcRgb_c.c @@ -1,9 +1,8 @@ /************************************************************************** - * Piotr's Image&Video Toolbox Version 2.2 - * Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] - * Please email me if you find bugs, or have suggestions or questions! - * Licensed under the Simplified BSD License [see external/bsd.txt] - *************************************************************************/ +* Piotr's Computer Vision Matlab Toolbox Version 2.2 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] +* Licensed under the Simplified BSD License [see external/bsd.txt] +**************************************************************************/ #include "mex.h" typedef unsigned char uchar; diff --git a/videos/private/opticalFlowHsMex.cpp b/videos/private/opticalFlowHsMex.cpp index 85fae223..368e14d9 100644 --- a/videos/private/opticalFlowHsMex.cpp +++ b/videos/private/opticalFlowHsMex.cpp @@ -1,7 +1,6 @@ /******************************************************************************* -* Piotr's Image&Video Toolbox Version 3.01 -* Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -* Please email me if you find bugs, or have suggestions or questions! +* Piotr's Computer Vision Matlab Toolbox Version 3.01 +* Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] * Licensed under the Simplified BSD License [see external/bsd.txt] *******************************************************************************/ #include "string.h" diff --git a/videos/seqIo.m b/videos/seqIo.m index 668d8206..5142ab6d 100644 --- a/videos/seqIo.m +++ b/videos/seqIo.m @@ -56,9 +56,8 @@ % seqIo>toImgs, seqIo>frImgs, seqIo>convert, seqIo>newHeader, % seqIo>readerDual, seqPlayer, seqReaderPlugin, seqWriterPlugin % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] switch lower(action) diff --git a/videos/seqPlayer.m b/videos/seqPlayer.m index 367ca94f..2e358d55 100644 --- a/videos/seqPlayer.m +++ b/videos/seqPlayer.m @@ -28,9 +28,8 @@ function seqPlayer( fName, dispFunc ) % % See also SEQIO % -% Piotr's Image&Video Toolbox Version 2.61 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.61 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] if(nargin<1), fName=[]; end diff --git a/videos/seqReaderPlugin.m b/videos/seqReaderPlugin.m index cfd011e1..5dd5d654 100644 --- a/videos/seqReaderPlugin.m +++ b/videos/seqReaderPlugin.m @@ -29,9 +29,8 @@ % % See also SEQIO, SEQWRITERPLUGIN % -% Piotr's Image&Video Toolbox Version 3.10 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 3.10 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % persistent variables to keep track of all loaded .seq files diff --git a/videos/seqWriterPlugin.m b/videos/seqWriterPlugin.m index 7c6406ea..87ddf2e7 100644 --- a/videos/seqWriterPlugin.m +++ b/videos/seqWriterPlugin.m @@ -37,9 +37,8 @@ % % See also SEQIO, SEQREADERPLUGIN % -% Piotr's Image&Video Toolbox Version 2.66 -% Copyright 2012 Piotr Dollar. [pdollar-at-caltech.edu] -% Please email me if you find bugs, or have suggestions or questions! +% Piotr's Computer Vision Matlab Toolbox Version 2.66 +% Copyright 2014 Piotr Dollar. [pdollar-at-gmail.com] % Licensed under the Simplified BSD License [see external/bsd.txt] % persistent variables to keep track of all loaded .seq files