Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/synfig/renddesc.h b/synfig-core/trunk/src/synfig/renddesc.h
index b6eb419..cce4fd3 100644 (file)
--- a/synfig-core/trunk/src/synfig/renddesc.h
+++ b/synfig-core/trunk/src/synfig/renddesc.h
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -54,23 +55,23 @@ class RendDesc
 public:
        enum Lock
        {
-               PX_ASPECT=(1<<0),
-               PX_AREA=(1<<1),
-               PX_W=(1<<2),
-               PX_H=(1<<3),
-
-               IM_ASPECT=(1<<4),
-               IM_SPAN=(1<<5),
-               IM_W=(1<<6),
-               IM_H=(1<<7),
-               IM_ZOOMIN=(1<<8),
-               IM_ZOOMOUT=(1<<9),
-
-               LINK_PX_ASPECT=(1<<10),
-               LINK_PX_AREA=(1<<11),
-               LINK_IM_ASPECT=(1<<12),
-               LINK_IM_SPAN=(1<<13),
-               LINK_IM_CENTER=(1<<14)
+               PX_ASPECT=(1<<0),               // "Pixel Aspect" in Locks and Links
+               PX_AREA=(1<<1),                 // not used
+               PX_W=(1<<2),                    // "Pixel Width" in Locks and Links - not used
+               PX_H=(1<<3),                    // "Pixel Height" in Locks and Links - not used
+
+               IM_ASPECT=(1<<4),               // "Image Aspect" in Locks and Links
+               IM_SPAN=(1<<5),                 // "Image Span" in Locks and Links
+               IM_W=(1<<6),                    // "Image Width" in Locks and Links
+               IM_H=(1<<7),                    // "Image Height" in Locks and Links
+               IM_ZOOMIN=(1<<8),               // not used
+               IM_ZOOMOUT=(1<<9),              // not used
+
+               LINK_PX_ASPECT=(1<<10), // not used
+               LINK_PX_AREA=(1<<11),   // not used
+               LINK_IM_ASPECT=(1<<12), // not used
+               LINK_IM_SPAN=(1<<13),   // not used
+               LINK_IM_CENTER=(1<<14)  // not used
        };
 
 private:
@@ -278,7 +279,7 @@ public:
        //! Returns the height of one pixel
        Real get_ph()const;
 
-       //! Sets viewport to represent the screen at the give pixel coordinates
+       //! Sets viewport to represent the screen at the given pixel coordinates
        RendDesc &set_subwindow(int x, int y, int w, int h);
 };     // END of class RendDesc
 
@@ -303,16 +304,6 @@ inline RendDesc::Lock operator~(RendDesc::Lock rhs)
        return static_cast<RendDesc::Lock>(~(int)rhs);
 }
 
-//! This operator is for checking RendDesc::Lock flags.
-/*! Don't think of it as "less then or equal to", but think of it
-**     like an arrow. Is \a rhs inside of \a lhs ?
-**     \see RendDesc::Lock, RendDesc */
-inline bool operator<=(RendDesc::Lock lhs, RendDesc::Lock rhs)
-{
-       return static_cast<int>(lhs) & static_cast<int>(rhs)==static_cast<int>(rhs);
-}
-
-
 }; /* end namespace synfig */
 
 /* === E N D =============================================================== */