[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnash-commit
Subject:    [Gnash-commit] gnash ChangeLog libgeometry/Range2d.h
From:       Sandro Santilli <strk () keybit ! net>
Date:       2007-02-28 22:53:25
Message-ID: E1HMXfp-000147-0m () savannah ! gnu ! org
[Download RAW message or body]

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/02/28 22:53:24

Modified files:
	.              : ChangeLog 
	libgeometry    : Range2d.h 

Log message:
	        * libgeometry/Range2d.h (scale): allow the scaled range to be
	          monodimensional in any direction.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2500&r2=1.2501
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Range2d.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2500
retrieving revision 1.2501
diff -u -b -r1.2500 -r1.2501
--- ChangeLog	28 Feb 2007 19:57:27 -0000	1.2500
+++ ChangeLog	28 Feb 2007 22:53:24 -0000	1.2501
@@ -1,5 +1,7 @@
 2007-02-28 Sandro Santilli <strk@keybit.net>
 
+	* libgeometry/Range2d.h (scale): allow the scaled range to be
+	  monodimensional in any direction.
 	* gui/gui.cpp: removed extra tokens at end of #include directive.
 	* libgeometry/snappingrange.h: strip CRs, fix contains(), copyright
 	  notice and doxygen formatting.

Index: libgeometry/Range2d.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Range2d.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libgeometry/Range2d.h	28 Feb 2007 12:26:32 -0000	1.12
+++ libgeometry/Range2d.h	28 Feb 2007 22:53:24 -0000	1.13
@@ -19,7 +19,7 @@
 //
 
 
-/* $Id: Range2d.h,v 1.12 2007/02/28 12:26:32 martinwguy Exp $ */
+/* $Id: Range2d.h,v 1.13 2007/02/28 22:53:24 strk Exp $ */
 
 #ifndef GNASH_RANGE2D_H
 #define GNASH_RANGE2D_H
@@ -484,14 +484,14 @@
 		{
 			_xmin = scaleMin(_xmin, xfactor);
 			_xmax = scaleMax(_xmax, xfactor);
-			assert(_xmin < _xmax); // in case of overflow...
+			assert(_xmin <= _xmax); // in case of overflow...
 		}
 
 		if ( yfactor != 1 )
 		{
 			_ymin = scaleMin(_ymin, yfactor);
 			_ymax = scaleMax(_ymax, yfactor);
-			assert(_ymin < _ymax); // in case of overflow...
+			assert(_ymin <= _ymax); // in case of overflow...
 		}
 
 		return *this;



[prev in list] [next in list] [prev in thread] [next in thread]