Commits · 5799b14a2735532ef2f9ce6dacfdea408e3ffb68 · aflab / astrogeology / Autocnet

Browse files

Jan 15, 2016
- Merge branch 'master' of https://github.com/kree/autocnet · 5799b14a
  kberry authored Jan 15, 2016
  
  5799b14a
- Undo unnecessary addition · 62f112af
  kberry authored Jan 14, 2016
  
  62f112af
- Resolved merge conflict · 9df29d0f
  kberry authored Dec 10, 2015
  
  9df29d0f
- Merge pull request #19 from jlaura/functional_test · 558e71b8
  jcwbacker authored Jan 15, 2016
  558e71b8
- Updated functional test to pass dict to SIFT · 362db13f
  Jay authored Jan 15, 2016
  
  362db13f
- merging from upstream · 67d4bf73
  jay authored Jan 15, 2016
  
  67d4bf73
- Merge remote-tracking branch 'upstream/master' · 3d2eb91c
  jay authored Jan 15, 2016
  
  3d2eb91c
- Adding missing two image adjacency, required for two image functional test. · b268b39a
  Jay authored Jan 15, 2016
  
  b268b39a
- Updates to the tests to cover x,y measure addition in protobuf · 46fdbc16
  jay authored Jan 15, 2016
  
  46fdbc16
- Working functional test generating an ISIS compliant cnet with measures having x,y coordinates. · 5de651c2
  Jay authored Jan 15, 2016
  
  5de651c2
- merge from master · c3771da2
  jay authored Jan 15, 2016
  
  c3771da2
Jan 14, 2016
- Merge pull request #18 from jcwbacker/master · e0a3af7a
  jlaura authored Jan 14, 2016
  e0a3af7a
- Updated documentation files to include extract_metadata, feature_extractor,... · fb60b0d5
  jcwbacker authored Jan 14, 2016
  fb60b0d5
- Changed input parameter for feature extractor to take a dictionary of keywords. · b771cb1d
  jcwbacker authored Jan 14, 2016
  
  b771cb1d
- Undo unnecessary addition · 11e3c24f
  kberry authored Jan 14, 2016
  
  11e3c24f
- Merge branch 'matching' · a4335246
  kberry authored Jan 14, 2016
  
  a4335246
- 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
- Updates to the function tests. · 9fbd0ba9
  Jay authored Jan 14, 2016
  
  9fbd0ba9
- 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