diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-05 15:45:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-05 15:45:05 +0000 |
| commit | b5b97ce4ddb978369c5a07f2a5f1cb3347156721 (patch) | |
| tree | a43728c7896277d34c1735d85b69ce1bb087fefb /src/lib/util.cc | |
| parent | 8596e31595c9aba128078ba4a3950543ea291f98 (diff) | |
More header file rearrangement.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index bf4c74244..20b7ba470 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -22,46 +22,6 @@ * @brief Some utility functions and classes. */ -#include <iomanip> -#include <iostream> -#include <fstream> -#include <climits> -#include <stdexcept> -#ifdef DCPOMATIC_POSIX -#include <execinfo.h> -#include <cxxabi.h> -#endif -#include <libssh/libssh.h> -#include <signal.h> -#include <boost/algorithm/string.hpp> -#include <boost/bind.hpp> -#include <boost/lambda/lambda.hpp> -#include <boost/thread.hpp> -#include <boost/filesystem.hpp> -#ifdef DCPOMATIC_WINDOWS -#include <boost/locale.hpp> -#endif -#include <glib.h> -#include <openjpeg.h> -#include <pangomm/init.h> -#ifdef DCPOMATIC_IMAGE_MAGICK -#include <magick/MagickCore.h> -#else -#include <magick/common.h> -#include <magick/magick_config.h> -#endif -#include <magick/version.h> -#include <dcp/version.h> -#include <dcp/util.h> -#include <dcp/signer.h> -#include <dcp/raw_convert.h> -extern "C" { -#include <libavcodec/avcodec.h> -#include <libavformat/avformat.h> -#include <libswscale/swscale.h> -#include <libavfilter/avfiltergraph.h> -#include <libavutil/pixfmt.h> -} #include "util.h" #include "exceptions.h" #include "scaler.h" @@ -80,6 +40,46 @@ extern "C" { #ifdef DCPOMATIC_WINDOWS #include "stack.hpp" #endif +#include <dcp/version.h> +#include <dcp/util.h> +#include <dcp/signer.h> +#include <dcp/raw_convert.h> +extern "C" { +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libswscale/swscale.h> +#include <libavfilter/avfiltergraph.h> +#include <libavutil/pixfmt.h> +} +#include <glib.h> +#include <openjpeg.h> +#include <pangomm/init.h> +#ifdef DCPOMATIC_IMAGE_MAGICK +#include <magick/MagickCore.h> +#else +#include <magick/common.h> +#include <magick/magick_config.h> +#endif +#include <magick/version.h> +#include <libssh/libssh.h> +#include <boost/algorithm/string.hpp> +#include <boost/bind.hpp> +#include <boost/lambda/lambda.hpp> +#include <boost/thread.hpp> +#include <boost/filesystem.hpp> +#ifdef DCPOMATIC_WINDOWS +#include <boost/locale.hpp> +#endif +#include <signal.h> +#include <iomanip> +#include <iostream> +#include <fstream> +#include <climits> +#include <stdexcept> +#ifdef DCPOMATIC_POSIX +#include <execinfo.h> +#include <cxxabi.h> +#endif #include "i18n.h" |