Remove .gitignore do nothing is ignored.

[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 5117eb5..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
 **
-**     $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
@@ -43,7 +43,7 @@ namespace synfig {
 */
 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;
 
@@ -51,6 +51,8 @@ public:
        Point br;
        int c;
        mutable Surface surface;
+       mutable bool trimmed;
+       mutable unsigned int width, height, top, left;
 
        Real gamma_adjust;
 
@@ -66,7 +68,7 @@ public:
 
        virtual Rect get_bounding_rect()const;
 
-       virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &rend_desc, ProgressCallback *callback)const;
+       virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 
        virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
 }; // END of class Layer_Bitmap