[vlfeat] 02/10: Merge branch 'upstream'

[Dima Kogan]

This is an automated email from the git hooks/post-receive script.

dkogan-guest pushed a commit to branch master
in repository vlfeat.

commit 06fad25fa3453ca616168d5565c9ecd0b0e90abc
Merge: 1f3dc23 57ef2be
Author: Dima Kogan <dima at secretsauce.net>
Date:   Fri Oct 3 01:06:54 2014 -0700

    Merge branch 'upstream'

 Makefile                         |   7 +-
 Makefile.mak                     |   2 +-
 README                           | 139 ---------------------------------------
 README.md                        | 120 +++++++++++++++++++++++++++++++++
 docsrc/images/vl_blue_large.pxm  | Bin 0 -> 187581 bytes
 docsrc/index.html                |  34 +++++++---
 docsrc/tutorials/encode.html     |  39 +++++------
 docsrc/vlfeat.css                |  22 +++++--
 docsrc/webdoc.py                 |   2 +-
 make/dist.mak                    |   2 +
 make/matlab.mak                  |  20 ++++--
 toolbox/misc/vl_matlabversion.m  |   6 +-
 toolbox/misc/vl_svmtrain.c       |  12 ++--
 toolbox/plotop/vl_plotframe.m    |   5 +-
 toolbox/plotop/vl_printsize.m    |  18 +++--
 toolbox/plotop/vl_roc.m          | 127 ++++++++++++++++++++---------------
 vl/covdet.c                      |  29 ++++----
 vl/generic.h                     |   2 +-
 vl/gmm.h                         |   2 +-
 vl/liop.c                        |  12 ++--
 vl/vlad.c                        |   2 +-
 vlfeat.xcodeproj/project.pbxproj |  12 +++-
 22 files changed, 335 insertions(+), 279 deletions(-)

diff --cc docsrc/tutorials/encode.html
index b1979e1,bdd8f8c..da0a2d7
--- a/docsrc/tutorials/encode.html
+++ b/docsrc/tutorials/encode.html
@@@ -9,15 -9,15 +9,15 @@@ compute <b><a href="%dox:fisher;">Fishe
  <b><a href="%dox:vlad;">VLAD</a></b> encodings with VLFeat MATLAB
  interface.</p>
  
- <p>These encoding serve a similar purposes: summarising in a vectorial
+ <p>These encoding serve a similar purposes: summarizing in a vectorial
  statistic a number of local feature descriptors
 -(e.g. SIFT</a>). Similarly to bag of visual
 +(e.g. SIFT). Similarly to bag of visual
- words, they compare local descriptor to a dictionary, obtained with
- vectonr quantization (KMeans) in the case of VLAD
- and <a href="%dox:gmm;">Gaussina Mixture Models</a> for Fisher
- Vectors. However, rather than storing visual word occurences only,
- these representation store the difference between dictonary elements
- and pooled local features.</p>
+ words, they assign local descriptor to elements in a visual
+ dictionary, obtained with vector quantization (KMeans) in the case of
+ VLAD or a Gaussian Mixture Models for Fisher
+ Vectors. However, rather than storing visual word occurrences only,
+ these representations store a statistics of the difference between
+ dictionary elements and pooled local features.</p>
  
  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
  <h1 id="tut.fisher">Fisher encoding</h1>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vlfeat.git