Commit 5c586e02 authored Jan 13, 2016 by kberry

modify scipy.misc / bytescale import to fix travis ci problem?

parent f547cd06

autocnet/matcher/feature_extractor.py

+3 −1

Original line number	Diff line number	Diff line
		import cv2
		from scipy import misc

		def extract_features(image_array, num_nodes=500):
		"""
		@@ -19,4 +20,5 @@ def extract_features(image_array, num_nodes=500):
		This tuple is in the form (list of KeyPoints, array of descriptors)
		"""
		sift = cv2.xfeatures2d.SIFT_create(num_nodes)
		return sift.detectAndCompute(image_array, None)
		No newline at end of file
		converted_array = misc.bytescale(image_array)
		return sift.detectAndCompute(converted_array, None)

autocnet/matcher/tests/test_feature_extractor.py

+1 −2

Original line number	Diff line number	Diff line
		import os
		import numpy as np
		import unittest
		from scipy.misc import bytescale
		from autocnet.examples import get_path
		import cv2

		@@ -15,7 +14,7 @@ from autocnet.fileio import io_gdal
		class TestFeatureExtractor(unittest.TestCase):
		def setUp(self):
		self.dataset = io_gdal.GeoDataset(get_path('Mars_MGS_MOLA_ClrShade_MAP2_0.0N0.0_MERC.tif'))
		self.data_array = bytescale(self.dataset.read_array())
		self.data_array = self.dataset.read_array()

		def test_extract_features(self):
		features = feature_extractor.extract_features(self.data_array, 10)