projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.0
[libdcp.git]
/
src
/
argb_frame.h
diff --git
a/src/argb_frame.h
b/src/argb_frame.h
index a9946bb04c59aa44a64ebd49906b053a51940118..419227bbbb19bd1504d18ae661db4cbd9944d831 100644
(file)
--- a/
src/argb_frame.h
+++ b/
src/argb_frame.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-18,13
+18,13
@@
*/
/** @file src/argb_frame.h
*/
/** @file src/argb_frame.h
- * @brief
Container for a single image from a picture asset.
+ * @brief
ARGBFrame class.
*/
*/
-#include <stdint.h>
#include "util.h"
#include "util.h"
+#include <stdint.h>
-namespace
lib
dcp
+namespace dcp
{
/** @class ARGBFrame
{
/** @class ARGBFrame
@@
-34,34
+34,36
@@
namespace libdcp
*
* <pre>
* Byte /- 0 -------|- 1 --------|- 2 --------|- 3 --------|- 4 --------|- 5 --------| ...
*
* <pre>
* Byte /- 0 -------|- 1 --------|- 2 --------|- 3 --------|- 4 --------|- 5 --------| ...
- * |(0, 0) Blue|(0, 0)
Red |(0, 0) Blue |(0, 0) Alpha|(0, 1) Blue |(0, 1) Red
| ...
+ * |(0, 0) Blue|(0, 0)
Green |(0, 0) Red |(0, 0) Alpha|(0, 1) Blue |(0, 1) Green
| ...
* </pre>
*
* So that the first byte is the blue component of the pixel at x=0, y=0, the second
* </pre>
*
* So that the first byte is the blue component of the pixel at x=0, y=0, the second
- * is the
red
component, and so on.
+ * is the
green
component, and so on.
*
* Lines are packed so that the second row directly follows the first.
*/
*
* Lines are packed so that the second row directly follows the first.
*/
-class ARGBFrame
+class ARGBFrame
: boost::noncopyable
{
public:
ARGBFrame (Size size);
~ARGBFrame ();
{
public:
ARGBFrame (Size size);
~ARGBFrame ();
+ /** @return pointer to the image data */
uint8_t* data () const {
return _data;
}
uint8_t* data () const {
return _data;
}
- /**
L
ength of one picture row in bytes */
+ /**
@return l
ength of one picture row in bytes */
int stride () const;
int stride () const;
+ /** @return size of the picture in pixels */
Size size () const {
return _size;
}
private:
Size size () const {
return _size;
}
private:
- Size _size;
- uint8_t* _data;
+ Size _size;
///< frame size in pixels
+ uint8_t* _data;
///< pointer to image data
};
}
};
}