projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename XYZImage -> OpenJPEGImage.
[libdcp.git]
/
src
/
util.h
diff --git
a/src/util.h
b/src/util.h
index ca00ecb9147a1a232760426636d9cc16b35e667b..52a5dcde87e1ba24a030ced1a87a8dfaf93c0de7 100644
(file)
--- a/
src/util.h
+++ b/
src/util.h
@@
-27,7
+27,6
@@
#include "types.h"
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
#include "types.h"
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
#include <openjpeg.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
#include <openjpeg.h>
@@
-36,37
+35,15
@@
namespace xmlpp {
class Element;
namespace xmlpp {
class Element;
+ class Node;
}
namespace dcp {
}
namespace dcp {
-class ARGB
Fram
e;
+class ARGB
Imag
e;
class CertificateChain;
class GammaLUT;
class CertificateChain;
class GammaLUT;
-class XYZFrame;
-
-/** @struct Size
- * @brief The integer, two-dimensional size of something.
- */
-struct Size
-{
- Size ()
- : width (0)
- , height (0)
- {}
-
- Size (int w, int h)
- : width (w)
- , height (h)
- {}
-
- float ratio () const {
- return float (width) / height;
- }
-
- int width;
- int height;
-};
+class OpenJPEGImage;
extern bool operator== (Size const & a, Size const & b);
extern bool operator!= (Size const & a, Size const & b);
extern bool operator== (Size const & a, Size const & b);
extern bool operator!= (Size const & a, Size const & b);
@@
-77,7
+54,8
@@
extern std::string make_digest (boost::filesystem::path filename, boost::functio
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 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 boost::shared_ptr<XYZFrame> decompress_j2k (uint8_t* data, int64_t size, int reduce);
+extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (uint8_t* data, int64_t size, int reduce);
+extern bool ids_equal (std::string a, std::string b);
extern void init ();
extern void init ();
@@
-87,10
+65,10
@@
extern void add_signer (xmlpp::Element* parent, CertificateChain const & certifi
extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
extern boost::optional<boost::filesystem::path> relative_to_root (boost::filesystem::path root, boost::filesystem::path file);
extern int base64_decode (std::string const & in, unsigned char* out, int out_length);
extern boost::optional<boost::filesystem::path> relative_to_root (boost::filesystem::path root, boost::filesystem::path file);
-extern std::string tm_to_string (struct tm *);
-extern std::string utc_offset_to_string (int);
-extern std::string ptime_to_string (boost::posix_time::ptime);
extern FILE * fopen_boost (boost::filesystem::path, std::string);
extern FILE * fopen_boost (boost::filesystem::path, std::string);
+extern std::string file_to_string (boost::filesystem::path, uintmax_t max_length = 65536);
+extern std::string private_key_fingerprint (std::string key);
+extern xmlpp::Node* find_child (xmlpp::Node const * node, std::string name);
template <class F, class T>
std::list<boost::shared_ptr<T> >
template <class F, class T>
std::list<boost::shared_ptr<T> >