Commit d3693348 authored by Jay's avatar Jay
Browse files

Moving cv2 around to try and get build

parent 1c8906e4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
import numpy as np
from autocnet.camera.utils import crossform
import cv2
from cv2 import triangulatePoints



@@ -102,7 +102,7 @@ def triangulate(pt, pt1, p, p1):
    if pt1.shape[0] != 3:
        pt1 = pt1.T

    X = cv2.triangulatePoints(p, p1, pt[:2], pt1[:2])
    X = triangulatePoints(p, p1, pt[:2], pt1[:2])
    X /= X[3] # Homogenize
    return X

+3 −4
Original line number Diff line number Diff line
import warnings

import autocnet
import cv2
from cv2 import ORB_create, FastFeatureDetector_create
import numpy as np
import pandas as pd
from autocnet.utils.utils import bytescale
@@ -49,10 +48,10 @@ def extract_features(array, extractor_method='sift', extractor_parameters={}):
    descriptors : ndarray
                  Of descriptors
    """
    detectors = {'fast': cv2.FastFeatureDetector_create,
    detectors = {'fast': FastFeatureDetector_create,
                 'sift': SIFT,
                 'surf': SURF,
                 'orb': cv2.ORB_create}
                 'orb' : ORB_create}

    if extractor_method == 'vlfeat' and vlfeat != True:
        raise ImportError('VLFeat is not available.  Please install vlfeat or use a different extractor.')
+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ import sys
import unittest
import warnings

import cv2

from .. import cpu_matcher
from autocnet.examples import get_path
from autocnet.graph.network import CandidateGraph