X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_bitmap.h;h=b62a93e4e01cea47cfc14b7d90a0d6ee1c1cc31e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=cb34471b51b286f28e5d5d3bffa255f834f5a3f3;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_bitmap.h b/synfig-core/trunk/src/synfig/layer_bitmap.h
index cb34471..b62a93e 100644
--- a/synfig-core/trunk/src/synfig/layer_bitmap.h
+++ b/synfig-core/trunk/src/synfig/layer_bitmap.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_LAYER_BITMAP_H
-#define __SINFG_LAYER_BITMAP_H
+#ifndef __SYNFIG_LAYER_BITMAP_H
+#define __SYNFIG_LAYER_BITMAP_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -35,42 +36,44 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 /*!	\class Layer_Bitmap
 **	\todo writeme
 */
 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 sinfg::Layer::Handle hit_check(sinfg::Context context, const sinfg::Point &point)const;
+	virtual synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
 }; // END of class Layer_Bitmap
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */