Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alexandre Pinto 2017-10-10 14:38:35 +01:00
commit ac1f646463

View File

@ -290,7 +290,7 @@ Image Processing
* `Adience Unfiltered faces for gender and age classification <http://www.openu.ac.il/home/hassner/Adience/data.html>`_ * `Adience Unfiltered faces for gender and age classification <http://www.openu.ac.il/home/hassner/Adience/data.html>`_
* `Affective Image Classification <http://www.imageemotion.org/>`_ * `Affective Image Classification <http://www.imageemotion.org/>`_
* `Animals with attributes <http://attributes.kyb.tuebingen.mpg.de/>`_ * `Animals with attributes <http://attributes.kyb.tuebingen.mpg.de/>`_
* `Caltech Pedestrian Detection Benchmark <https://www.vision.caltech.edu/Image_Datasets/CaltechPedestrians/>`_ * `Caltech Pedestrian Detection Benchmark <http://www.vision.caltech.edu/Image_Datasets/CaltechPedestrians/>`_
* `Chars74K dataset, Character Recognition in Natural Images (both English and Kannada are available) <http://www.ee.surrey.ac.uk/CVSSP/demos/chars74k/>`_ * `Chars74K dataset, Character Recognition in Natural Images (both English and Kannada are available) <http://www.ee.surrey.ac.uk/CVSSP/demos/chars74k/>`_
* `Face Recognition Benchmark <http://www.face-rec.org/databases/>`_ * `Face Recognition Benchmark <http://www.face-rec.org/databases/>`_
* `Flickr: 32 Class Brand Logos <http://www.multimedia-computing.de/flickrlogos/>`_ * `Flickr: 32 Class Brand Logos <http://www.multimedia-computing.de/flickrlogos/>`_
@ -546,7 +546,6 @@ Software
Sports Sports
------ ------
* `Basketball (NBA/NCAA/Euro) Player Database and Statistics <http://www.draftexpress.com/stats.php>`_
* `Betfair Historical Exchange Data <http://data.betfair.com/>`_ * `Betfair Historical Exchange Data <http://data.betfair.com/>`_
* `Cricsheet Matches (cricket) <http://cricsheet.org/>`_ * `Cricsheet Matches (cricket) <http://cricsheet.org/>`_
* `Ergast Formula 1, from 1950 up to date (API) <http://ergast.com/mrd/db>`_ * `Ergast Formula 1, from 1950 up to date (API) <http://ergast.com/mrd/db>`_