[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/12 16:04:06

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp movie_root.cpp 
        server/asobj   : Stage.cpp 

Log message:
        * server/edit_text_character.cpp: don't use == when comparing
          floats.
        * server/asobj/Stage.cpp: return actual stage size when scaleMode
          is noScale. This allows the stage resize listeners to work
          out what to do (which is the point of noScale).
        * server/movie_root:cpp: minor cast cleanup.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5887&r2=1.5888
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.158&r2=1.159
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.166&r2=1.167
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5887
retrieving revision 1.5888
diff -u -b -r1.5887 -r1.5888
--- ChangeLog   12 Mar 2008 11:47:55 -0000      1.5887
+++ ChangeLog   12 Mar 2008 16:04:04 -0000      1.5888
@@ -1,5 +1,14 @@
 2008-03-12 Benjamin Wolsey <address@hidden>
 
+       * server/edit_text_character.cpp: don't use == when comparing
+         floats.
+       * server/asobj/Stage.cpp: return actual stage size when scaleMode
+         is noScale. This allows the stage resize listeners to work
+         out what to do (which is the point of noScale).
+       * server/movie_root.cpp: minor cast cleanup.
+
+2008-03-12 Benjamin Wolsey <address@hidden>
+
        * server/asobj/Stage.cpp: don't call align 'width'; implement
          getting and setting Stage.align, though it won't do anything.
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -b -r1.158 -r1.159
--- server/edit_text_character.cpp      4 Mar 2008 12:21:13 -0000       1.158
+++ server/edit_text_character.cpp      12 Mar 2008 16:04:05 -0000      1.159
@@ -884,10 +884,13 @@
                float xmin = _bounds.getMinX();
                float ymin = _bounds.getMinY();
                float ymax = _bounds.getMaxY();
-               float xmax = xmin+nw;
+               float xmax = xmin + nw;
+
                assert(xmin <= xmax);
+
                _bounds.setTo(xmin, ymin, xmax, ymax);
-               assert(_bounds.width() == nw);
+               
+           assert( _bounds.width() - nw < 0.001 && _bounds.width() - nw > 
-0.001);
 
                // previously truncated text might get visible now
                // TODO: if nested masks were implemented we would 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- server/movie_root.cpp       10 Mar 2008 08:19:39 -0000      1.166
+++ server/movie_root.cpp       12 Mar 2008 16:04:05 -0000      1.167
@@ -155,8 +155,10 @@
 
        m_viewport_x0 = 0;
        m_viewport_y0 = 0;
-       m_viewport_width = 
(int)movie->get_movie_definition()->get_width_pixels();
-       m_viewport_height = 
(int)movie->get_movie_definition()->get_height_pixels();
+       m_viewport_width = static_cast<int>(
+                       movie->get_movie_definition()->get_width_pixels());
+       m_viewport_height = static_cast<int>(
+                       movie->get_movie_definition()->get_height_pixels());
        m_pixel_scale = 1;
 
        // assert(movie->get_depth() == 0); ?
@@ -172,7 +174,8 @@
        }
        catch (ActionLimitException& al)
        {
-               log_error(_("ActionLimits hit during setRootMovie: %s. 
Disabling scripts"), al.what());
+               log_error(_("ActionLimits hit during setRootMovie: %s."
+                                       "Disabling scripts"), al.what());
                disableScripts();
                clearActionQueue();
        }
@@ -192,7 +195,8 @@
 movie_root::setLevel(unsigned int num, boost::intrusive_ptr<movie_instance> 
movie)
 {
        assert(movie != NULL);
-       assert(static_cast<unsigned int>(movie->get_depth()) == 
num+character::staticDepthOffset);
+       assert(static_cast<unsigned int>(movie->get_depth()) ==
+                               num + character::staticDepthOffset);
 
 
        Levels::iterator it = _movies.find(movie->get_depth());

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/Stage.cpp      12 Mar 2008 11:47:56 -0000      1.32
+++ server/asobj/Stage.cpp      12 Mar 2008 16:04:06 -0000      1.33
@@ -118,23 +118,22 @@
 unsigned
 Stage::getWidth() const
 {
-  //if (_scaleMode==showAll)      <-- the only mode implemented in Gnash 
-       return (unsigned 
int)VM::get().getRoot().get_movie_definition()->get_width_pixels();
-       /*
-       else
+    if (_scaleMode == noScale)
+    {
        return VM::get().getRoot().getWidth();
-       */      
+    }
+    return (unsigned 
int)VM::get().getRoot().get_movie_definition()->get_width_pixels();
+       
 }
 
 unsigned
 Stage::getHeight() const
 {
-  //if (_scaleMode==showAll)      <-- the only mode implemented in Gnash 
-       return (unsigned 
int)VM::get().getRoot().get_movie_definition()->get_height_pixels();
-       /*
-       else
+    if (_scaleMode == noScale)
+    {
        return VM::get().getRoot().getHeight();
-       */      
+    }
+    return (unsigned 
int)VM::get().getRoot().get_movie_definition()->get_height_pixels();
 }
 
 const char*