Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / lyr_std / supersample.cpp

diff --git a/synfig-core/trunk/src/modules/lyr_std/supersample.cpp b/synfig-core/trunk/src/modules/lyr_std/supersample.cpp
index 1a07899..608a242 100644 (file)
--- a/synfig-core/trunk/src/modules/lyr_std/supersample.cpp
+++ b/synfig-core/trunk/src/modules/lyr_std/supersample.cpp
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Synfig
-** Template File
-** $Id: supersample.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file supersample.cpp
+**     \brief Implementation of the "Super Sample" layer
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     \legal
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** 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 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.
+**
+**     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
 **
 ** === N O T E S ===========================================================
 **
@@ -48,10 +52,10 @@
 
 SYNFIG_LAYER_INIT(SuperSample);
 SYNFIG_LAYER_SET_NAME(SuperSample,"super_sample");
-SYNFIG_LAYER_SET_LOCAL_NAME(SuperSample,_("Super Sample"));
-SYNFIG_LAYER_SET_CATEGORY(SuperSample,_("Other"));
+SYNFIG_LAYER_SET_LOCAL_NAME(SuperSample,N_("Super Sample"));
+SYNFIG_LAYER_SET_CATEGORY(SuperSample,N_("Other"));
 SYNFIG_LAYER_SET_VERSION(SuperSample,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(SuperSample,"$Id: supersample.cpp,v 1.1.1.1 2005/01/04 01:23:10 darco Exp $");
+SYNFIG_LAYER_SET_CVS_ID(SuperSample,"$Id$");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -71,7 +75,7 @@ SuperSample::set_param(const String & param, const ValueBase &value)
        IMPORT(height);
        IMPORT(scanline);
        IMPORT(alpha_aware);
-       
+
        return false;
 }
 
@@ -82,7 +86,7 @@ SuperSample::get_param(const String& param)const
        EXPORT(height);
     EXPORT(scanline);
     EXPORT(alpha_aware);
-       
+
        EXPORT_NAME();
        EXPORT_VERSION();
 
@@ -95,7 +99,7 @@ SuperSample::accelerated_render(Context context,Surface *surface,int quality, co
        // don't bother supersampling if our quality is too low.
        if(quality>=10)
                return context.accelerated_render(surface,quality,renddesc,cb);
-       
+
        RendDesc desc(renddesc);
 
        SuperCallback subcb(cb,1,9000,10000);
@@ -166,7 +170,7 @@ SuperSample::accelerated_render(Context context,Surface *surface,int quality, co
                                else
                                        pen.put_value(Color::alpha());
                        }
-                       if(y&31==0 && cb)
+                       if((y&31)==0 && cb)
                        {
                                if(!stagetwo.amount_complete(y,surface->get_h()))
                                        return false;
@@ -189,16 +193,16 @@ SuperSample::accelerated_render(Context context,Surface *surface,int quality, co
                                temp_pen.dec_y(v);
                                pen.put_value(pool*multiplier);
                        }
-                       if(y&31==0 && cb)
+                       if((y&31)==0 && cb)
                        {
                                if(!stagetwo.amount_complete(y,surface->get_h()))
                                        return false;
                        }
                }
        }
-       
+
        if(cb && !cb->amount_complete(10000,10000)) return false;
-       
+
        return true;
 }
 
@@ -222,7 +226,7 @@ SuperSample::get_param_vocab(void)const
        ret.push_back(ParamDesc("alpha_aware")
                .set_local_name(_("Be Alpha Safe"))
        );
-       
+
        return ret;
 }