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 646cbda..b62a93e 100644 (file)
--- a/synfig-core/trunk/src/synfig/layer_bitmap.h
+++ b/synfig-core/trunk/src/synfig/layer_bitmap.h
@@ -2,19 +2,20 @@
 /*!    \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 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -42,30 +43,32 @@ 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;       
+       typedef etl::handle<Layer_Bitmap> Handle;
 
        Point tl;
        Point br;
        int c;
        mutable Surface surface;
-       
+       mutable bool trimmed;
+       mutable unsigned int width, height, top, left;
+
        Real gamma_adjust;
-       
+
        Layer_Bitmap();
-       
+
        virtual bool set_param(const String & param, ValueBase value);
 
        virtual ValueBase get_param(const String & param)const;
 
        virtual Color get_color(Context context, const Point &pos)const;
-       
+
        virtual Vocab get_param_vocab()const;
 
        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