Include tidying src/lib/a-j*.h

[dcpomatic.git] / src / lib / image_content.cc

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 3f62c3ebfdccbddd487b30751e43d226d9cc3307..37aa7cbc1953017107b8403f95a611713fc6bb99 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <libcxml/cxml.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "compose.hpp"
@@ -26,6 +25,8 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
 
 #include "i18n.h"
 
@@ -58,7 +59,7 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
                if (_paths.empty()) {
                        throw FileError (_("No valid image files were found in the folder."), p);
                }
-                               
+
                sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
        }
 
@@ -73,7 +74,7 @@ ImageContent::ImageContent (shared_ptr<const Film> film, cxml::ConstNodePtr node
        : Content (film, node)
        , VideoContent (film, node, version)
 {
-       
+
 }
 
 string
@@ -120,7 +121,7 @@ ImageContent::examine (shared_ptr<Job> job)
 
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
-       
+
        shared_ptr<ImageExaminer> examiner (new ImageExaminer (film, shared_from_this(), job));
        take_from_video_examiner (examiner);
 }
@@ -142,7 +143,7 @@ ImageContent::full_length () const
        shared_ptr<const Film> film = _film.lock ();
        DCPOMATIC_ASSERT (film);
        FrameRateChange const frc (video_frame_rate(), film->video_frame_rate());
-       return DCPTime::from_frames (rint (video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
+       return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor ()), film->video_frame_rate ());
 }
 
 string
@@ -168,10 +169,10 @@ ImageContent::set_video_frame_rate (float r)
                if (_video_frame_rate == r) {
                        return;
                }
-               
+
                _video_frame_rate = r;
        }
-       
+
        signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }