X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsurface.cpp;h=91e16636f32c494c0184d9120dd082ae5cab206d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=e5f531baad2851fd8d923a88293603e7a5b3076b;hpb=70bcefce2ab011a11014f36fc129b473cc0bc61e;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp
index e5f531b..91e1663 100644
--- a/synfig-core/trunk/src/synfig/surface.cpp
+++ b/synfig-core/trunk/src/synfig/surface.cpp
@@ -2,6 +2,8 @@
 /*!	\file surface.cpp
 **	\brief Template File
 **
+**	$Id$
+**
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
@@ -88,7 +90,7 @@ target2surface::set_rend_desc(synfig::RendDesc *newdesc)
 }
 
 bool
-target2surface::start_frame(synfig::ProgressCallback *cb)
+target2surface::start_frame(synfig::ProgressCallback */*cb*/)
 {
 	if(surface->get_w() != desc.get_w() || surface->get_h() != desc.get_h())
 	{
@@ -218,14 +220,14 @@ synfig::Surface::blit_to(alpha_pen& pen, int x, int y, int w, int h)
 		top.data=static_cast<void*>(operator[](y)+x);
 		top.height=h;
 		top.width=w;
-		//top.rowBytes=get_w()*sizeof(Color); //! \fixme this should get the pitch!!
+		//top.rowBytes=get_w()*sizeof(Color); //! \todo this should get the pitch!!
 		top.rowBytes=get_pitch();
 
 		bottom.data=static_cast<void*>(pen.x());
 		bottom.height=h;
 		bottom.width=w;
-		//bottom.rowBytes=pen.get_width()*sizeof(Color); //! \fixme this should get the pitch!!
-		bottom.rowBytes=pen.get_pitch(); //! \fixme this should get the pitch!!
+		//bottom.rowBytes=pen.get_width()*sizeof(Color); //! \todo this should get the pitch!!
+		bottom.rowBytes=pen.get_pitch(); //! \todo this should get the pitch!!
 
 		vImage_Error ret;
 		ret=vImageAlphaBlend_ARGBFFFF(&top,&bottom,&dest,kvImageNoFlags);