Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / palette.h

diff --git a/synfig-core/trunk/src/synfig/palette.h b/synfig-core/trunk/src/synfig/palette.h
index 066e4e0..32ed214 100644 (file)
--- a/synfig-core/trunk/src/synfig/palette.h
+++ b/synfig-core/trunk/src/synfig/palette.h
@@ -1,28 +1,29 @@
-/* === S I N F G =========================================================== */
-/*!    \file Palette.h
+/* === S Y N F I G ========================================================= */
+/*!    \file palette.h
 **     \brief Template Header
 **
-**     $Id: palette.h,v 1.1.1.1 2005/01/04 01:23:14 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_PALETTE_H
-#define __SINFG_PALETTE_H
+#ifndef __SYNFIG_PALETTE_H
+#define __SYNFIG_PALETTE_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -36,16 +37,16 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 class Surface;
-       
+
 struct PaletteItem
 {
        Color color;
        String name;
        int weight;
-       
+
        PaletteItem():weight(1) { }
 
        PaletteItem(const Color& color, const String& name, int weight=1):
@@ -53,20 +54,20 @@ struct PaletteItem
 
        PaletteItem(const Color& color, int weight=1):
                color(color),weight(weight) { }
-               
+
        void add(const Color& x, int weight=1);
-               
+
        bool operator<(const PaletteItem& rhs)const { return weight<rhs.weight; }
 }; // END of struct PaletteItem
 
 class Palette : public std::vector<PaletteItem>
 {
        String name_;
-       
+
 public:
        Palette();
        Palette(const String& name_);
-       
+
        /*! Generates a palette for the given
        **      surface
        */
@@ -76,17 +77,17 @@ public:
        const_iterator find_closest(const Color& color, float* dist=0)const;
 
        iterator find_heavy();
-       
+
        iterator find_light();
 
        static Palette grayscale(int steps=16);
 
-       void save_to_file(const sinfg::String& filename)const;
+       void save_to_file(const synfig::String& filename)const;
 
-       static Palette load_from_file(const sinfg::String& filename);
+       static Palette load_from_file(const synfig::String& filename);
 }; // END of class Palette
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */