Commit 1fb78c90 authored by Jan Eichler's avatar Jan Eichler
Browse files

Important bugfix: executable can now be built with an up-to-date gcc.

Tested with gcc_7.
Prerequisites: install last stable Vigra (1.11.1)
Changes made:
in caxes.h: precompiler includes befor libraries.
in cgp_structure.hxx: correcting obsolete omp syntax
parent e27a848a
#include <cmath>
#include <vector>
#include <iostream>
#include <fstream>
#include <string>
#include <sys/stat.h>
#include <vigra/stdimage.hxx>
#include <vigra/impex.hxx>
#include <vigra/labelimage.hxx>
......@@ -9,12 +16,7 @@
#include <vigra/flatmorphology.hxx>
#include <vigra/multi_array.hxx>
#define _USE_MATH_DEFINES
#include <cmath>
#include <vector>
#include <iostream>
#include <fstream>
#include <string>
#include <sys/stat.h>
#include <cgp/cgp_hdf5.hxx>
#include "cgp_structure.hxx"
#include "marray.hxx"
......
......@@ -390,7 +390,7 @@ void compute_and_save_cgp_data_structure(std::string dest_path, int size, int ra
//close bin-group
H5Gclose(h);
}
#pragma omp end critical
//#pragma omp end critical
int x_center=-1, y_center=-1;
......@@ -543,7 +543,7 @@ void compute_and_save_cgp_data_structure(std::string dest_path, int size, int ra
}
*/
#pragma omp end critical
//#pragma omp end critical
}
......
......@@ -2,7 +2,7 @@
#include "misorient.cpp"
#include <unistd.h>
std::string cAxes_version = "20.03.17 slim";
std::string cAxes_version = "20.11.11 slim";
//functions
int analysis();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment