Solve the gamma problem (corrected locale when loading/saving settings file)

[synfig.git] / synfig-core / trunk / src / synfig / surface.cpp

diff --git a/synfig-core/trunk/src/synfig/surface.cpp b/synfig-core/trunk/src/synfig/surface.cpp
index 37037b2..eb55068 100644 (file)
--- a/synfig-core/trunk/src/synfig/surface.cpp
+++ b/synfig-core/trunk/src/synfig/surface.cpp
@@ -3,16 +3,17 @@
 ** Template File
 ** $Id: surface.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
 **
-** 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.
 **
 ** === N O T E S ===========================================================
 **
@@ -157,12 +158,12 @@ synfig::Surface::blit_to(alpha_pen& pen, int x, int y, int w, int h)
                }
                                
                //clip width against dest width
-               w = min(w,pen.end_x()-pen.x());
-               h = min(h,pen.end_y()-pen.y());
+               w = min((long)w,(long)(pen.end_x()-pen.x()));
+               h = min((long)h,(long)(pen.end_y()-pen.y()));
                
                //clip width against src width
-               w = min(w,get_w()-x);           
-               h = min(h,get_h()-y);   
+               w = min(w,get_w()-x);
+               h = min(h,get_h()-y);
 
                if(w<=0 || h<=0)
                        return;