running ok with old and new gcp_list.txt layout.

Former-commit-id: 42d32982c5
pull/1161/head
yjmenezes 2018-03-02 21:13:54 -03:00
rodzic ee7b1c794b
commit c1a6210ed4
4 zmienionych plików z 13 dodań i 7 usunięć

8
modules/odm_georef/src/Georef.cpp 100755 → 100644
Wyświetl plik

@ -683,9 +683,11 @@ void Georef::readGCPs()
{
std::istringstream istr(gcpString);
GeorefGCP gcp;
// if ( ! gcpString[0] || gcpString[0] == '#' ) { /* skip comments */
//TODO skip empty lines too
if ( istr.peek() == '#' || istr.peek() == '\r' || istr.peek() == '\n' ) { /* skip comments */
if ( gcpString.empty() ) {
continue;
}
if ( istr.peek() == '#' ) { /* skip comments */
continue;
}
gcp.extractGCP(istr);

0
modules/odm_georef/src/Georef.hpp 100755 → 100644
Wyświetl plik

Wyświetl plik

@ -1,11 +1,14 @@
#ODM 0.3.1 under Debian 8.10 jessie - 2018-02-27 by yjmenezes
#https://github.com/OpenDroneMap/OpenDroneMap/wiki/Docker
git clone https://github.com/OpenDroneMap/OpenDroneMap.git
#git clone https://github.com/OpenDroneMap/OpenDroneMap.git
git clone https://github.com/yjmenezes/OpenDroneMap.git
cd OpenDroneMap
# list images
docker images
#remove old my_odm_image if necessary
docker rmi my_odm_image
docker rmi my_odm_image
#build a fresh one
docker build -t my_odm_image
docker build -t my_odm_image .
#run tests with supplied image set.
#Mapped host directories for output. -v host_path:container_path
cd tests/test_data/

Wyświetl plik

@ -8,7 +8,8 @@ EPSG:32617
274914.738 4603349.014 400 1268.023 31.309 DJI_0104.JPG HV01
#274914.738 4603349.014 400 1350.499 -1506.619 1JI_0076.JPG badHV01
274914.738 4603349.014 400 1350.499 1506.619 1JI_0076.JPG HV01
# this is a comment, skip
# this is a comment, skip and skip empty line
# GCP02, no idGCP ( old format )
274915.887 4603307.715 400 1276.695 1043.561 DJI_0068.JPG
274915.887 4603307.715 400 750.239 81.604 DJI_0104.JPG