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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/02/15 17:51:43

Modified files:
        .              : ChangeLog 
        server/parser  : BitmapMovieDefinition.cpp 
        server         : BitmapMovieInstance.cpp 

Log message:
        Corrected JPG scale

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2366&r2=1.2367
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2366
retrieving revision 1.2367
diff -u -b -r1.2366 -r1.2367
--- ChangeLog   15 Feb 2007 11:14:51 -0000      1.2366
+++ ChangeLog   15 Feb 2007 17:51:42 -0000      1.2367
@@ -1,3 +1,8 @@
+2007-02-14 Udo Giacomozzi <address@hidden>
+
+  * server/BitmapMovieInstance.cpp, server/parser/BitmapMovieDefinition.cpp:
+    Corrected JPG scale  
+
 2007-02-14 Sandro Santilli <address@hidden>
 
        * server/: movie_instance.cpp, movie_root.cpp: move

Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/BitmapMovieDefinition.cpp     14 Feb 2007 14:12:47 -0000      
1.4
+++ server/parser/BitmapMovieDefinition.cpp     15 Feb 2007 17:51:43 -0000      
1.5
@@ -51,9 +51,7 @@
        // Add the bitmap fill style (fill style 0)
 
        fill_style bmFill(_bitmap.get());
-       line_style line(40, rgba(255, 0, 0, 255));
        _shapedef->add_fill_style(bmFill);
-       _shapedef->add_line_style(line);
 
        // Define a rectangle filled with the bitmap style
 
@@ -62,7 +60,7 @@
 
        //log_msg("Creating a shape_definition wrapping a %f x %f bitmap", w, 
h);
 
-       path bmPath(w, h, 1, 0, 1);
+       path bmPath(w, h, 1, 0, 0);
        bmPath.drawLineTo(w, 0);
        bmPath.drawLineTo(0, 0);
        bmPath.drawLineTo(0, h);
@@ -80,7 +78,7 @@
                const std::string& url)
        :
        _version(6),
-       _framesize(0, 0, image->m_width*20, image->m_height*20),
+       _framesize(0, 0, image->m_width, image->m_height),
        _framecount(1),
        _playlist(_framecount),
        _framerate(12),

Index: server/BitmapMovieInstance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/BitmapMovieInstance.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/BitmapMovieInstance.cpp      14 Feb 2007 14:12:47 -0000      1.3
+++ server/BitmapMovieInstance.cpp      15 Feb 2007 17:51:43 -0000      1.4
@@ -36,6 +36,9 @@
        :
        movie_instance(def, NULL)
 {
+  matrix mat;
+  mat.concatenate_scale(20.0);
+  
        // We need to assign a character id to the instance, or an assertion
        // will fail in character.cpp (parent==NULL || id != -1)
        character_def* chdef = def->get_character_def(1); 
@@ -43,7 +46,7 @@
        boost::intrusive_ptr<character> ch = 
chdef->create_character_instance(this, 1);
        //log_msg("Created char in BitmapMovieInstance is a %s", 
typeid(*ch).name());
        int depth = 1;
-       place_character(ch.get(), depth, cxform(), matrix(), 1.0, 0);
+       place_character(ch.get(), depth, cxform(), mat, 1.0, 0);
 }