Merge branch 'master' of /home/carl/git/libdcp

[libdcp.git] / src / util.h

diff --git a/src/util.h b/src/util.h
index f4c7d2866845bc54af31549d18ce5c2f54af3377..6332ddc08f157a4f3ec50754f94b7a20408dc137 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -17,29 +17,51 @@
 
 */
 
+#ifndef LIBDCP_UTIL_H
+#define LIBDCP_UTIL_H
+
 /** @file  src/util.h
  *  @brief Utility methods.
  */
 
 #include <string>
-#include <sigc++/sigc++.h>
+#include <stdint.h>
+#include <boost/shared_ptr.hpp>
+#include <openjpeg.h>
+#include "types.h"
 
 namespace libdcp {
 
-/** Create a UUID.
- *  @return UUID.
- */
-extern std::string make_uuid ();
+class ARGBFrame;
+class GammaLUT;
+class XYZsRGBLUT;
 
-/** Create a digest for a file.
- *  @param filename File name.
- *  @param progress If non-0, a signal which will be emitted periodically to update
- *  progress; the parameter will start at 0.5 and proceed to 1.
- *  @return Digest.
- */
-extern std::string make_digest (std::string filename, sigc::signal1<void, float>* progress);
+struct Size {
+       Size ()
+               : width (0)
+               , height (0)
+       {}
 
-extern std::string content_type_to_string (ContentType type);
-extern bool ends_with (std::string big, std::string little);
+       Size (int w, int h)
+               : width (w)
+               , height (h)
+       {}
+       
+       int width;
+       int height;
+};
        
+extern bool operator== (Size const & a, Size const & b);
+extern bool operator!= (Size const & a, Size const & b);
+
+extern std::string make_uuid ();
+extern std::string make_digest (std::string filename);
+extern std::string content_kind_to_string (ContentKind kind);
+extern ContentKind content_kind_from_string (std::string kind);
+extern bool empty_or_white_space (std::string s);
+extern opj_image_t* decompress_j2k (uint8_t* data, int64_t size, int reduce);
+extern boost::shared_ptr<ARGBFrame> xyz_to_rgb (opj_image_t* xyz_frame, boost::shared_ptr<const GammaLUT>, boost::shared_ptr<const GammaLUT>);
+
 }
+
+#endif