Applied the following dooglus patches from the sourceforge tracker:

[synfig.git] / synfig-studio / trunk / src / gtkmm / renderer_canvas.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp
index 1f73c4a..d533fbd 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file template.cpp
 **     \brief Template File
 **
 **     $Id: renderer_canvas.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **     \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
 */
 /* ========================================================================= */
@@ -38,7 +39,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -97,9 +98,9 @@ Renderer_Canvas::render_vfunc(
        if(!get_work_area())
                return;
        
-//     const sinfg::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
+//     const synfig::RendDesc &rend_desc(get_work_area()->get_canvas()->rend_desc());
        
-       const sinfg::Vector focus_point(get_work_area()->get_focus_point());
+       const synfig::Vector focus_point(get_work_area()->get_focus_point());
 
        std::vector< std::pair<Glib::RefPtr<Gdk::Pixbuf>,int> >& tile_book(get_tile_book());
        
@@ -108,14 +109,14 @@ Renderer_Canvas::render_vfunc(
        
        // Calculate the window coordinates of the top-left
        // corner of the canvas.
-       const sinfg::Vector::value_type
+       const synfig::Vector::value_type
                x(focus_point[0]/get_pw()+drawable_w/2-get_w()/2),
                y(focus_point[1]/get_ph()+drawable_h/2-get_h()/2);
 
-       /*const sinfg::Vector::value_type window_startx(window_tl[0]);
-       const sinfg::Vector::value_type window_endx(window_br[0]);
-       const sinfg::Vector::value_type window_starty(window_tl[1]);
-       const sinfg::Vector::value_type window_endy(window_br[1]);
+       /*const synfig::Vector::value_type window_startx(window_tl[0]);
+       const synfig::Vector::value_type window_endx(window_br[0]);
+       const synfig::Vector::value_type window_starty(window_tl[1]);
+       const synfig::Vector::value_type window_endy(window_br[1]);
        */
        const int
                tile_w(get_work_area()->get_tile_w()),