From b177280b8815c394cb67c713eb34260ebb72de94 Mon Sep 17 00:00:00 2001 From: dooglus Date: Sat, 15 Dec 2007 09:58:33 +0000 Subject: [PATCH] Fixed the remaining doxygen warnings and errors for synfig-core. git-svn-id: http://svn.voria.com/code@1202 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/doxygen.cfg.in | 2 +- synfig-core/trunk/src/synfig/blur.cpp | 6 +++--- synfig-core/trunk/src/synfig/canvas.cpp | 8 ++++---- synfig-core/trunk/src/synfig/color.h | 8 ++++---- synfig-core/trunk/src/synfig/curve_helper.cpp | 2 +- synfig-core/trunk/src/synfig/layer_polygon.cpp | 2 +- synfig-core/trunk/src/synfig/layer_shape.cpp | 2 +- synfig-core/trunk/src/synfig/main.cpp | 4 ++-- synfig-core/trunk/src/synfig/renddesc.cpp | 2 +- synfig-core/trunk/src/synfig/surface.cpp | 6 +++--- synfig-core/trunk/src/synfig/synfig.h | 2 ++ synfig-core/trunk/src/synfig/target.cpp | 2 +- synfig-core/trunk/src/synfig/waypoint.cpp | 4 ++-- synfig-core/trunk/src/template.cpp | 2 +- synfig-core/trunk/src/template.h | 2 +- 15 files changed, 28 insertions(+), 26 deletions(-) diff --git a/synfig-core/trunk/doxygen.cfg.in b/synfig-core/trunk/doxygen.cfg.in index 9c4e01a..dadf96b 100644 --- a/synfig-core/trunk/doxygen.cfg.in +++ b/synfig-core/trunk/doxygen.cfg.in @@ -478,7 +478,7 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = +EXCLUDE = src/synfig/surfacenew.cpp src/synfig/surfacenew.h src/template.cpp src/template.h # The EXCLUDE_SYMLINKS tag can be used select whether or not files or # directories that are symbolic links (a Unix filesystem feature) are excluded diff --git a/synfig-core/trunk/src/synfig/blur.cpp b/synfig-core/trunk/src/synfig/blur.cpp index 0e91f3c..4fff029 100644 --- a/synfig-core/trunk/src/synfig/blur.cpp +++ b/synfig-core/trunk/src/synfig/blur.cpp @@ -846,9 +846,9 @@ bool Blur::operator ()(const Surface &surface, return true; } -bool Blur::operator ()(const surface &surface, - const Vector &resolution, - surface &out) const +bool Blur::operator ()(const etl::surface &surface, + const synfig::Vector &resolution, + etl::surface &out) const { int w = surface.get_w(), h = surface.get_h(); diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp index c0763b5..eaa9062 100644 --- a/synfig-core/trunk/src/synfig/canvas.cpp +++ b/synfig-core/trunk/src/synfig/canvas.cpp @@ -69,7 +69,7 @@ int _CanvasCounter::counter(0); /* === M E T H O D S ======================================================= */ -Canvas::Canvas(const string &id): +Canvas::Canvas(const String &id): id_ (id), cur_time_ (0), is_inline_ (false), @@ -734,7 +734,7 @@ Canvas::push_back_simple(etl::handle x) } void -Canvas::erase(Canvas::iterator iter) +Canvas::erase(iterator iter) { if(!(*iter)->get_group().empty()) remove_group_pair((*iter)->get_group(),(*iter)); @@ -1258,13 +1258,13 @@ Canvas::remove_group_pair(String group, etl::handle layer) } void -Canvas::add_connection(Layer::LooseHandle layer, sigc::connection connection) +Canvas::add_connection(etl::loose_handle layer, sigc::connection connection) { connections_[layer].push_back(connection); } void -Canvas::disconnect_connections(Layer::LooseHandle layer) +Canvas::disconnect_connections(etl::loose_handle layer) { std::vector::iterator iter; for(iter=connections_[layer].begin();iter!=connections_[layer].end();++iter) diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h index 22d0587..7c8a356 100644 --- a/synfig-core/trunk/src/synfig/color.h +++ b/synfig-core/trunk/src/synfig/color.h @@ -477,7 +477,7 @@ public: BLEND_COMPOSITE=0, //!< Color A is composited onto B (Taking A's alpha into account) BLEND_STRAIGHT=1, //!< Straight linear interpolation from A->B (Alpha ignored) BLEND_ONTO=13, //!< Similar to BLEND_COMPOSITE, except that B's alpha is maintained - BLEND_STRAIGHT_ONTO=21, //!< \writeme + BLEND_STRAIGHT_ONTO=21, //!< \deprecated \writeme BLEND_BEHIND=12, //!< Similar to BLEND_COMPOSITE, except that B is composited onto A. BLEND_SCREEN=16, //!< \writeme BLEND_OVERLAY=20, //!< \writeme @@ -494,9 +494,9 @@ public: BLEND_SATURATION=10, //!< Preserves the magnitude of the UV Vector of color A BLEND_LUMINANCE=11, //!< Preserves the Y channel of color A - BLEND_ALPHA_BRIGHTEN=14, //!< If A is less opaque than B, use A - BLEND_ALPHA_DARKEN=15, //!< If A is more opaque than B, use B - BLEND_ALPHA_OVER=19, //!< multiply alphas and then straight blends using the amount + BLEND_ALPHA_BRIGHTEN=14, //!< \deprecated If A is less opaque than B, use A + BLEND_ALPHA_DARKEN=15, //!< \deprecated If A is more opaque than B, use B + BLEND_ALPHA_OVER=19, //!< \deprecated multiply alphas and then straight blends using the amount BLEND_END=22 //!< \internal }; diff --git a/synfig-core/trunk/src/synfig/curve_helper.cpp b/synfig-core/trunk/src/synfig/curve_helper.cpp index 00f95cf..d599620 100644 --- a/synfig-core/trunk/src/synfig/curve_helper.cpp +++ b/synfig-core/trunk/src/synfig/curve_helper.cpp @@ -621,7 +621,7 @@ void CIntersect::recurse_intersect(const SCurve &left, const SCurve &right, int -bool CIntersect::operator()(const bezier &c1, const bezier &c2) +bool CIntersect::operator()(const etl::bezier &c1, const etl::bezier &c2) { times.clear(); diff --git a/synfig-core/trunk/src/synfig/layer_polygon.cpp b/synfig-core/trunk/src/synfig/layer_polygon.cpp index e3cec1f..a6b4ccb 100644 --- a/synfig-core/trunk/src/synfig/layer_polygon.cpp +++ b/synfig-core/trunk/src/synfig/layer_polygon.cpp @@ -106,7 +106,7 @@ Layer_Polygon::sync() } void -Layer_Polygon::add_polygon(const vector &point_list) +Layer_Polygon::add_polygon(const std::vector &point_list) { int i,pointcount=point_list.size(); diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index 8a90f19..86bc671 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -2859,7 +2859,7 @@ Layer_Shape::render_shape(Surface *surface,bool useblend,int /*quality*/, } bool -Layer_Shape::render_shape(surface *surface,int /*quality*/, +Layer_Shape::render_shape(etl::surface *surface,int /*quality*/, const RendDesc &renddesc, ProgressCallback */*cb*/)const { // If our amount is set to zero, no need to render anything diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index da9cd31..f3cb717 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -379,8 +379,8 @@ synfig::Main::~Main() Target::subsys_stop(); synfig::info("Layer::subsys_stop()"); Layer::subsys_stop(); - /*! \fixme For some reason, uncommenting the next line will cause things to crash. - This needs to be looked into at some point. */ + /*! \todo For some reason, uncommenting the next line will cause things to crash. + This needs to be looked into at some point. */ // synfig::info("Module::subsys_stop()"); // Module::subsys_stop(); synfig::info("Exiting"); diff --git a/synfig-core/trunk/src/synfig/renddesc.cpp b/synfig-core/trunk/src/synfig/renddesc.cpp index fba31a5..c899e7b 100644 --- a/synfig-core/trunk/src/synfig/renddesc.cpp +++ b/synfig-core/trunk/src/synfig/renddesc.cpp @@ -525,7 +525,7 @@ RendDesc::set_viewport(const Point &__tl, const Point &__br) { tl_=__tl; br_=__br; return *this; } RendDesc & -RendDesc::set_viewport(Real a,Real b,Real c,Real d) +RendDesc::set_viewport(Vector::value_type a, Vector::value_type b, Vector::value_type c, Vector::value_type d) { tl_=Point(a,b); br_=Point(c,d); return *this; } Real diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp index f783d9c..91e1663 100644 --- a/synfig-core/trunk/src/synfig/surface.cpp +++ b/synfig-core/trunk/src/synfig/surface.cpp @@ -220,14 +220,14 @@ synfig::Surface::blit_to(alpha_pen& pen, int x, int y, int w, int h) top.data=static_cast(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(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); diff --git a/synfig-core/trunk/src/synfig/synfig.h b/synfig-core/trunk/src/synfig/synfig.h index 8c6886c..bcedd26 100644 --- a/synfig-core/trunk/src/synfig/synfig.h +++ b/synfig-core/trunk/src/synfig/synfig.h @@ -33,6 +33,8 @@ /* === M A C R O S ========================================================= */ +#define SYNFIG_LEAN +#undef SYNFIG_LEAN /*! \def SYNFIG_LEAN ** \brief Define this to remove unused features, speeding up compile time. ** diff --git a/synfig-core/trunk/src/synfig/target.cpp b/synfig-core/trunk/src/synfig/target.cpp index a6c75a9..6a73822 100644 --- a/synfig-core/trunk/src/synfig/target.cpp +++ b/synfig-core/trunk/src/synfig/target.cpp @@ -95,7 +95,7 @@ Target::Target(): } void -synfig::Target::set_canvas(Canvas::Handle c) +synfig::Target::set_canvas(etl::handle c) { canvas=c; RendDesc desc=canvas->rend_desc(); diff --git a/synfig-core/trunk/src/synfig/waypoint.cpp b/synfig-core/trunk/src/synfig/waypoint.cpp index 6d5653c..1befa6f 100644 --- a/synfig-core/trunk/src/synfig/waypoint.cpp +++ b/synfig-core/trunk/src/synfig/waypoint.cpp @@ -63,7 +63,7 @@ Waypoint::Waypoint(ValueBase value, Time time): after=before=INTERPOLATION_LINEAR; } -Waypoint::Waypoint(ValueNode::Handle value_node, Time time): +Waypoint::Waypoint(etl::handle value_node, Time time): priority_(0), before(INTERPOLATION_TCB), after(INTERPOLATION_TCB), @@ -99,7 +99,7 @@ Waypoint::set_value(const ValueBase &x) } void -Waypoint::set_value_node(const ValueNode::Handle &x) +Waypoint::set_value_node(const etl::handle &x) { if(!value_node && x->get_type()==ValueBase::TYPE_ANGLE) after=before=INTERPOLATION_LINEAR; diff --git a/synfig-core/trunk/src/template.cpp b/synfig-core/trunk/src/template.cpp index cef9f56..0adf303 100644 --- a/synfig-core/trunk/src/template.cpp +++ b/synfig-core/trunk/src/template.cpp @@ -1,5 +1,5 @@ /* === S Y N F I G ========================================================= */ -/*! \file synfig/src/template.cpp +/*! \file template.cpp ** \brief Template File ** ** $Id$ diff --git a/synfig-core/trunk/src/template.h b/synfig-core/trunk/src/template.h index 47f08a6..124824c 100644 --- a/synfig-core/trunk/src/template.h +++ b/synfig-core/trunk/src/template.h @@ -1,5 +1,5 @@ /* === S Y N F I G ========================================================= */ -/*! \file synfig/src/template.h +/*! \file template.h ** \brief Template Header ** ** $Id$ -- 2.7.4