Merge pull request #11 from leiyangleon/update_v1.0.7

update autoRIFT to version 1.0.7
nasa-jpl · Sep 11, 2020 · 3f69e35 · 3f69e35
2 parents b91cef4 + 2b02a48
commit 3f69e35
Show file tree

Hide file tree

Showing 7 changed files with 1,072 additions and 632 deletions.
diff --git a/geo_autoRIFT/SConscript b/geo_autoRIFT/SConscript
@@ -22,6 +22,7 @@ import os
 Import('envcontrib')
 package = 'geo_autoRIFT'
 envgeoAutorift = envcontrib.Clone()
+envgeoAutorift.MergeFlags('-std=c++11')
 envgeoAutorift['PACKAGE'] = envcontrib['PACKAGE'] + '/' + package
 install = envcontrib['PRJ_SCONS_INSTALL'] + '/' + envgeoAutorift['PACKAGE']
 listFiles = ['__init__.py']

diff --git a/geo_autoRIFT/autoRIFT/bindings/autoriftcoremodule.cpp b/geo_autoRIFT/autoRIFT/bindings/autoriftcoremodule.cpp
@@ -41,6 +41,7 @@
 #include "iostream"
 #include "numpy/arrayobject.h"
 #include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc/types_c.h"
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/core/core.hpp"
 

diff --git a/geo_autoRIFT/geogrid/GeogridOptical.py b/geo_autoRIFT/geogrid/GeogridOptical.py
diff --git a/geo_autoRIFT/geogrid/bindings/geogridmodule.cpp b/geo_autoRIFT/geogrid/bindings/geogridmodule.cpp
@@ -403,6 +403,7 @@ PyObject* setRO2VYFilename(PyObject *self, PyObject *args)
     return Py_BuildValue("i", 0);
 }
 
+
 PyObject* setLookSide(PyObject *self, PyObject *args)
 {
     uint64_t ptr;
-Original file line number
+Diff line change
@@ Expand Up / @@ -403,6 +403,7 @@ PyObject* setRO2VYFilename(PyObject *self, PyObject *args) @@
         return Py_BuildValue("i", 0);
     }
     PyObject* setLookSide(PyObject *self, PyObject *args)
     {
         uint64_t ptr;
@@ Expand Down @@