[Gnash-commit] gnash ChangeLog server/parser/BitmapMovieDefini...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/15 21:16:29

Modified files:
        .              : ChangeLog 
        server/parser  : BitmapMovieDefinition.cpp 
                         BitmapMovieDefinition.h movie_definition.h 

Log message:
        Fix framesize of toplevel movie when loading a bitmap from commandline:
        gnash <image>
        
                * server/parser/movie_definition.h: documented get_frame_size().
                * server/parser/BitmapMovieDefinition.h 
(get_{width,height}_pixels):
                  use TWIPS_TO_PIXELS for consistency with movie_definition.
                * server/parser/BitmapMovieDefinition.cpp (getShapeDef): use 1 
twip
                  per image pixel while drawing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2368&r2=1.2369
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2368
retrieving revision 1.2369
diff -u -b -r1.2368 -r1.2369
--- ChangeLog   15 Feb 2007 20:11:23 -0000      1.2368
+++ ChangeLog   15 Feb 2007 21:16:29 -0000      1.2369
@@ -1,3 +1,11 @@
+2007-02-15 Sandro Santilli <address@hidden>
+
+       * server/parser/movie_definition.h: documented get_frame_size().
+       * server/parser/BitmapMovieDefinition.h (get_{width,height}_pixels):
+         use TWIPS_TO_PIXELS for consistency with movie_definition.
+       * server/parser/BitmapMovieDefinition.cpp (getShapeDef): use 1 twip
+         per image pixel while drawing.
+
 2007-02-15  Rob Savoye  <address@hidden>
 
        * extensions/gtk2: New directory for Gtk2 API extension.

Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/BitmapMovieDefinition.cpp     15 Feb 2007 17:51:43 -0000      
1.5
+++ server/parser/BitmapMovieDefinition.cpp     15 Feb 2007 21:16:29 -0000      
1.6
@@ -55,10 +55,13 @@
 
        // Define a rectangle filled with the bitmap style
 
-       float w = _framesize.width();
-       float h = _framesize.height();
+       // We use one twip for each pixel in the image
+       // The character will be scaled * 20
+       // when placed in BitmapMovieInstance's DisplayList
+       float w = _framesize.width()/20;
+       float h = _framesize.height()/20;
 
-       //log_msg("Creating a shape_definition wrapping a %f x %f bitmap", w, 
h);
+       log_msg("Creating a shape_definition wrapping a %g x %g bitmap", w, h);
 
        path bmPath(w, h, 1, 0, 0);
        bmPath.drawLineTo(w, 0);
@@ -78,7 +81,8 @@
                const std::string& url)
        :
        _version(6),
-       _framesize(0, 0, image->m_width, image->m_height),
+       // image::rgb size is in pixels
+       _framesize(0, 0, image->m_width*20, image->m_height*20),
        _framecount(1),
        _playlist(_framecount),
        _framerate(12),

Index: server/parser/BitmapMovieDefinition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/BitmapMovieDefinition.h       14 Feb 2007 09:03:53 -0000      
1.2
+++ server/parser/BitmapMovieDefinition.h       15 Feb 2007 21:16:29 -0000      
1.3
@@ -90,11 +90,11 @@
        }
 
        virtual float   get_width_pixels() const {
-               return _framesize.width()/20;
+               return ceilf(TWIPS_TO_PIXELS(_framesize.width()));
        }
 
        virtual float   get_height_pixels() const {
-               return _framesize.height()/20;
+               return ceilf(TWIPS_TO_PIXELS(_framesize.height()));
        }
 
        virtual size_t  get_frame_count() const {

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/movie_definition.h    9 Feb 2007 10:35:49 -0000       1.17
+++ server/parser/movie_definition.h    15 Feb 2007 21:16:29 -0000      1.18
@@ -98,6 +98,8 @@
        virtual float   get_height_pixels() const = 0;
        virtual size_t  get_frame_count() const = 0;
        virtual float   get_frame_rate() const = 0;
+
+       /// Return size of frame, in TWIPS 
        virtual const rect& get_frame_size() const = 0;
 
        virtual size_t get_bytes_loaded() const = 0;