projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hopefully fix black borders round the preview in some cases.
[dcpomatic.git]
/
src
/
lib
/
image.h
diff --git
a/src/lib/image.h
b/src/lib/image.h
index 8ca6aae09b751a05512fd44038694e081ce946b5..814ad1c5895a8c7d6edd8f5ed7563c4479c306cd 100644
(file)
--- a/
src/lib/image.h
+++ b/
src/lib/image.h
@@
-24,9
+24,9
@@
#ifndef DCPOMATIC_IMAGE_H
#define DCPOMATIC_IMAGE_H
#ifndef DCPOMATIC_IMAGE_H
#define DCPOMATIC_IMAGE_H
-#include "util.h"
#include "position.h"
#include "position_image.h"
#include "position.h"
#include "position_image.h"
+#include "types.h"
#include <dcp/image.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <dcp/image.h>
extern "C" {
#include <libavcodec/avcodec.h>
@@
-37,6
+37,7
@@
extern "C" {
#include <string>
class Scaler;
#include <string>
class Scaler;
+class Socket;
class Image : public dcp::Image
{
class Image : public dcp::Image
{
@@
-48,9
+49,9
@@
public:
Image& operator= (Image const &);
~Image ();
Image& operator= (Image const &);
~Image ();
- uint8_t ** data () const;
+ uint8_t *
const
* data () const;
int * line_size () const;
int * line_size () const;
- int * stride () const;
+ int
const
* stride () const;
dcp::Size size () const;
bool aligned () const;
dcp::Size size () const;
bool aligned () const;