projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'zelgadis_master' into genete_master
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_bitmap.h
diff --git
a/synfig-core/trunk/src/synfig/layer_bitmap.h
b/synfig-core/trunk/src/synfig/layer_bitmap.h
index
be6c541
..
b62a93e
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_bitmap.h
+++ b/
synfig-core/trunk/src/synfig/layer_bitmap.h
@@
-2,7
+2,7
@@
/*! \file layer_bitmap.h
** \brief Template Header
**
/*! \file layer_bitmap.h
** \brief Template Header
**
-** $Id
: layer_bitmap.h,v 1.2 2005/01/24 03:08:18 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-43,7
+43,7
@@
namespace synfig {
*/
class Layer_Bitmap : public Layer_Composite, public Layer_NoDeform
{
*/
class Layer_Bitmap : public Layer_Composite, public Layer_NoDeform
{
- const Color& filter(
const
Color& c)const;
+ const Color& filter(Color& c)const;
public:
typedef etl::handle<Layer_Bitmap> Handle;
public:
typedef etl::handle<Layer_Bitmap> Handle;
@@
-51,6
+51,8
@@
public:
Point br;
int c;
mutable Surface surface;
Point br;
int c;
mutable Surface surface;
+ mutable bool trimmed;
+ mutable unsigned int width, height, top, left;
Real gamma_adjust;
Real gamma_adjust;