Merge branch 'master' of https://github.com/openptv/openptv

Author: alexlib

.gitignore

@@ -3,14 +3,21 @@
 .pydevproject
 .pydevproject.bak
 
-py_bind/optv/*.c
+.idea/
+.vscode/
+env/
 
-*.pyc
+py_bind/c_src
+py_bind/optv/*.c
+py_bind/dist
+py_bind/build
+py_bind/liboptv
 
 liboptv/config.h.in~
-
 liboptv/tests/check_fb.trs
 liboptv/build
-py_bind/build
 *~
 
+py_bind/optv/*.c
+py_bind/build
+*.pyc

.travis.yml

@@ -1,20 +1,19 @@
-language: c
-compiler:
-  - clang
-  - gcc
+language: python
 
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y cmake
-  - sudo apt-get install -y check
   - sudo apt-get install -y build-essential
   - sudo apt-get install -y git
+  - sudo apt install python-pip
+  - pip install numpy
+  - pip install cython
 
 install: true
 
 script:
-- cd liboptv
-- mkdir _build && cd _build
-- cmake ../
-- make
-- make verify
+- cd py_bind
+- python setup.py prepare
+- python setup.py install
+- cd test
+- pip install nose
+- nosetests

docker/Dockerfile

@@ -0,0 +1,10 @@
+# A Dockerfile for an Ubuntu machine that can compile liboptv and the Cython extensions
+
+FROM ubuntu:18.04
+
+RUN apt-get update
+RUN apt-get --assume-yes install cmake
+RUN apt-get --assume-yes install g++
+RUN apt-get --assume-yes install python-pip
+RUN pip install virtualenv
+RUN virtualenv /env --python=`which python2`

docker/docker-compose.yml

@@ -0,0 +1,10 @@
+# Set up the Ubuntu container so we can develop the Cython code on it
+version: '3'
+services:
+  optv-dev:
+    image: ptv-ubuntu:1
+    build: ./
+    volumes:
+      - ../:/src
+    command: tail -f /dev/null
+

liboptv/.gitignore

@@ -27,4 +27,9 @@ tests/.libs/
 tests/check_fb
 tests/*.o
 
+CMakeCache.txt
+*.cmake
+CMakeFiles/
+install_manifest.txt
+*.so
 stamp-h1

liboptv/CMakeLists.txt

@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
 project(OpenPTV)
-enable_testing()
+# enable_testing()
 add_subdirectory(src)
-add_subdirectory(tests)
+# add_subdirectory(tests)
 
 INSTALL(DIRECTORY include/ DESTINATION include/optv/)
 

liboptv/include/vec_utils.h

@@ -7,7 +7,18 @@ doubles.
 
 #include <math.h>
 
-#define EMPTY_CELL 0.0/0.0
+#ifdef NAN
+    #define EMPTY_CELL NAN
+#else
+    #if _MSC_VER <= 1500 // Visual C 2008 - for Python 2.7, or earlier
+        #define MSVC_NAN_REQUIRED
+        double return_nan(void);
+        #define EMPTY_CELL return_nan()
+    #else // More modern compilers or non Visual Studio
+        #define EMPTY_CELL 0.0/0.0
+    #endif
+#endif
+
 #define is_empty(x) isnan(x)
 #define norm(x,y,z) sqrt((x)*(x) + (y)*(y) + (z)*(z))
 

liboptv/src/orientation.c

@@ -262,6 +262,9 @@ double* orient (Calibration* cal_in, control_par *cpar, int nfix, vec3d fix[],
     double *P, *y, *yh, *Xbeta, *resi;
     vec3d glass_dir, tmp_vec, e1, e2;
 
+    double (*X)[NPAR];
+    double (*Xh)[NPAR];
+
     Calibration *cal;
 
     /* small perturbation for translation/rotation in meters and in radians */
@@ -278,8 +281,8 @@ double* orient (Calibration* cal_in, control_par *cpar, int nfix, vec3d fix[],
     Xbeta = (double *) calloc(maxsize, sizeof(double));
     resi = (double *) calloc(maxsize, sizeof(double));
 
-    double (*X)[NPAR] = malloc(sizeof (*X) * maxsize);
-    double (*Xh)[NPAR] = malloc(sizeof (*Xh) * maxsize);
+    X = malloc(sizeof (*X) * maxsize);
+    Xh = malloc(sizeof (*Xh) * maxsize);
 
     for(i = 0; i < maxsize; i++) {
         for(j = 0; j < NPAR; j++) {
@@ -759,13 +762,13 @@ int read_man_ori_fix(vec3d fix4[4], char* calblock_filename,
  * Returns: pointer to a new orient_par structure.
  */
 orient_par* read_orient_par(char *filename) {
+    orient_par *ret;
     FILE * file = fopen(filename, "r");
     if (file == NULL) {
         printf("Could not open orientation parameters file %s.\n", filename);
         return NULL;
     }
 
-    orient_par *ret;
     ret = malloc(sizeof(orient_par));
 
     if (   !(fscanf(file, "%d", &ret->useflag)==1)  /* use every point or every other pt */

liboptv/src/parameters.c

@@ -476,13 +476,14 @@ int compare_mm_np(mm_np *mm_np1, mm_np *mm_np2)
  * Returns: pointer to a new target_par structure.
  */
 target_par* read_target_par(char *filename) {
+    target_par *ret;
+
     FILE * file = fopen(filename, "r");
     if (file == NULL) {
         printf("Could not open target recognition parameters file %s.\n", filename);
         return NULL;
     }
 
-    target_par *ret;
     ret = malloc(sizeof(target_par));
 
     if (   !(fscanf(file, "%d", &ret->gvthres[0])==1)   /* threshold for binarization 1.image */

liboptv/src/track.c

@@ -31,6 +31,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#define _USE_MATH_DEFINES
+#include <math.h>
+
 /* internal-use defines, not needed by the outside world. */
 #define TR_UNUSED -1