Commits · 7f9248ab7d27889a804bbdc38657e68cfa3b5d22 · aflab / astrogeology / Autocnet

Browse files

Jan 14, 2016
- Merged upstream · 7f9248ab
  jay authored Jan 14, 2016
  
  7f9248ab
- Merge pull request #12 from kree/matching · a0468b31
  jlaura authored Jan 14, 2016
  a0468b31
- added pillow to .travis.yml to try to solve bytescale problem · d6823689
  kberry authored Jan 14, 2016
  
  d6823689
- Testing Travis/SciPy issues · 1487385c
  Jay authored Jan 14, 2016
  
  1487385c
- revert .travis.yml failed modification test · 551c3096
  kberry authored Jan 14, 2016
  
  551c3096
- Testing Travis/SciPy issues · 59fcb663
  Jay authored Jan 14, 2016
  
  59fcb663
- trying to solve can't find bytescale problem with travis · cbf37723
  kberry authored Jan 14, 2016
  
  cbf37723
- Testing Travis/SciPy issues · a6256c35
  Jay authored Jan 14, 2016
  
  a6256c35
- Testing Travis/SciPy issues · baddd3ff
  Jay authored Jan 14, 2016
  
  baddd3ff
- fixed travis.yml / merged with upstream/master · ce8d959e
  kberry authored Jan 14, 2016
  
  ce8d959e
- Merge pull request #16 from USGS-Astrogeology/revert-15-revert-14-master · 236d69cc
  jlaura authored Jan 14, 2016
  236d69cc
- Revert "Revert "Matcher in place"" · f0a9b20c
  jlaura authored Jan 14, 2016
  
  f0a9b20c
- Trying to force github comparison · f3ff311f
  Jay authored Jan 14, 2016
  
  f3ff311f
- Merge pull request #15 from USGS-Astrogeology/revert-14-master · 6105449b
  jlaura authored Jan 14, 2016
  6105449b
- Revert "Matcher in place" · bf08affd
  jlaura authored Jan 14, 2016
  
  bf08affd
- Merge pull request #14 from jlaura/master · 072e61cb
  Kristin Berry authored Jan 14, 2016
  072e61cb
- Post review. · 92c74089
  Jay authored Jan 14, 2016
  
  92c74089
- Update to the matcher to support arbitrary k · 74160bf6
  Jay authored Jan 14, 2016
  
  74160bf6
- Typo fixed · acc751b2
  Jay authored Jan 14, 2016
  
  acc751b2
- Can't have a sudo apt-get in a non root build... · a5cfab34
  Jay authored Jan 14, 2016
  
  a5cfab34
- Try the binstar install of opencv3 to avoid compilation. · 5577d1c7
  Jay authored Jan 14, 2016
  
  5577d1c7
- HTTPS to HTTP to try and avoid SSL error on TravisCI · 38e94f85
  Jay authored Jan 14, 2016
  
  38e94f85
- Update to travis trying to get openCV to build. · a0aa81a3
  Jay authored Jan 14, 2016
  
  a0aa81a3
- Revert "This commit adds a functional test for 2 image matching" · 19df28c9
  jay authored Jan 13, 2016
  19df28c9
- Revert "Updated spec. syntax to conform to Gherkin" · c6116cac
  jay authored Jan 13, 2016
  c6116cac
- backing out functional testing, moved to branch · c1b97dfd
  jay authored Jan 13, 2016
  
  c1b97dfd
- FLANN based matcher class in place. · 01ccffa1
  Jay authored Jan 13, 2016
  
  01ccffa1
- Merge remote-tracking branch 'upstream/master' · cdf2445a
  jay authored Jan 13, 2016
  
  cdf2445a
- Prototype matcher class · c30e43a9
  Jay authored Jan 13, 2016
  
  c30e43a9
- trying another slight modification to .travs.yml · e2ede608
  kberry authored Jan 13, 2016
  
  e2ede608
- added sudo to travis.yml · f416f066
  kberry authored Jan 13, 2016
  
  f416f066
- A first attempt at adding opencv to travis · 02e3a5ff
  kberry authored Jan 13, 2016
  
  02e3a5ff
Jan 13, 2016
- modify scipy.misc / bytescale import to fix travis ci problem? · 5c586e02
  kberry authored Jan 13, 2016
  
  5c586e02
- Remove bytescale requirements · f547cd06
  kberry authored Jan 13, 2016
  
  f547cd06
- Add bytescale requirements · 174c066e
  kberry authored Jan 13, 2016
  
  174c066e
- Created feature_extractor and associated test · 6320b33f
  kberry authored Jan 13, 2016
  
  6320b33f
- Actually created a python file and completely blank test for for feature_extractor · 827f046f
  kberry authored Jan 13, 2016
  
  827f046f
- Update structure for adding actual content to matcher directory · 3f42b7cb
  kberry authored Jan 13, 2016
  
  3f42b7cb
- Merge pull request #11 from jcwbacker/master · 464c37cd
  jlaura authored Jan 13, 2016
  464c37cd
- Updated travis and requirements documents to include networkx. · c94126a8
  jcwbacker authored Jan 13, 2016
  
  c94126a8