kopia lustrzana https://github.com/OpenDroneMap/ODM
rodzic
02fa5fb84e
commit
ff56d1a575
|
@ -125,6 +125,7 @@ set(custom_libs OpenGV
|
||||||
Catkin
|
Catkin
|
||||||
Ecto
|
Ecto
|
||||||
LASzip
|
LASzip
|
||||||
|
Exiv2
|
||||||
PDAL
|
PDAL
|
||||||
MvsTexturing
|
MvsTexturing
|
||||||
)
|
)
|
||||||
|
|
|
@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8)
|
||||||
set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
|
set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
|
||||||
|
|
||||||
find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
|
find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
|
||||||
find_library(EXIV2_LIBRARY "libexiv2.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
|
find_library(EXIV2_LIBRARY "libexiv2.so" PATHS "../SuperBuild/install/lib")
|
||||||
|
|
||||||
# Add compiler options.
|
# Add compiler options.
|
||||||
add_definitions(-Wall -Wextra)
|
add_definitions(-Wall -Wextra)
|
||||||
|
|
|
@ -50,7 +50,7 @@ int UtmExtractor::run(int argc, char **argv)
|
||||||
log_ << "For more detailed information, see log file." << "\n";
|
log_ << "For more detailed information, see log file." << "\n";
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::runtime_error& e)
|
||||||
{
|
{
|
||||||
log_.setIsPrintingInCout(true);
|
log_.setIsPrintingInCout(true);
|
||||||
log_ << "Error in OdmExtractUtm:\n";
|
log_ << "Error in OdmExtractUtm:\n";
|
||||||
|
@ -175,7 +175,7 @@ void UtmExtractor::extractUtm()
|
||||||
if (image.get() == 0) {
|
if (image.get() == 0) {
|
||||||
std::string error(imageFilename);
|
std::string error(imageFilename);
|
||||||
error += ": Image cannot be read";
|
error += ": Image cannot be read";
|
||||||
throw Exiv2::Error(1, error);
|
throw std::runtime_error(error.c_str());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
image->readMetadata();
|
image->readMetadata();
|
||||||
|
@ -184,7 +184,7 @@ void UtmExtractor::extractUtm()
|
||||||
if (exifData.empty()) {
|
if (exifData.empty()) {
|
||||||
std::string error(imageFilename);
|
std::string error(imageFilename);
|
||||||
error += ": No Exif data found in the file";
|
error += ": No Exif data found in the file";
|
||||||
throw Exiv2::Error(1, error);
|
throw std::runtime_error(error.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse exif data for positional data
|
// Parse exif data for positional data
|
||||||
|
|
Ładowanie…
Reference in New Issue