Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / surface.cpp

diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp
index ef5a53c..91e1663 100644 (file)
--- a/synfig-core/trunk/src/synfig/surface.cpp
+++ b/synfig-core/trunk/src/synfig/surface.cpp
@@ -1,8 +1,10 @@
-/* ========================================================================
-** Synfig
-** Template File
-** $Id: surface.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file surface.cpp
+**     \brief Template File
 **
+**     $Id$
+**
+**     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
 **     This package is free software; you can redistribute it and/or
@@ -14,6 +16,7 @@
 **     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
 **
 ** === N O T E S ===========================================================
 **
@@ -87,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())
        {
@@ -217,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);