[Gnash-commit] gnash ChangeLog backend/render_handler_cairo.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/11 16:01:51

Modified files:
        .              : ChangeLog 
        backend        : render_handler_cairo.cpp 

Log message:
        Patch by Timothy Lee <address@hidden>:
        Fix a bug in rgba_to_cairo_argb32(), which incremented only 3 instead 
of 4 bytes per pixel.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3714&r2=1.3715
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3714
retrieving revision 1.3715
diff -u -b -r1.3714 -r1.3715
--- ChangeLog   11 Jul 2007 15:18:00 -0000      1.3714
+++ ChangeLog   11 Jul 2007 16:01:50 -0000      1.3715
@@ -2,7 +2,8 @@
 
        * backend/render_handler_cairo.cpp: correct scaling and offset
          in video rendering. Optimize RGB data conversion as suggested
-         by John Gilmore.
+         by John Gilmore. Fix a bug in rgba_to_cairo_argb32(), which
+         incremented only 3 instead of 4 bytes per pixel.
 
 2007-07-11 Udo Giacomozzi <address@hidden>
 

Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- backend/render_handler_cairo.cpp    11 Jul 2007 15:18:00 -0000      1.21
+++ backend/render_handler_cairo.cpp    11 Jul 2007 16:01:51 -0000      1.22
@@ -25,7 +25,7 @@
 static cairo_t* g_cr = 0;
 
 
-// Converts from RGBA image to 32-bit pixels in CAIRO_FORMAT_RGB24 format
+// Converts from RGB image to 32-bit pixels in CAIRO_FORMAT_RGB24 format
 static void
 rgb_to_cairo_rgb24(uint8_t* dst, const image::rgb* im)
 {
@@ -50,7 +50,7 @@
     for (int y = 0;  y < im->m_height;  y++)
     {
        const uint8_t* src = image::scanline(im, y);
-       for (int x = 0;  x < im->m_width;  x++, src += 3)
+       for (int x = 0;  x < im->m_width;  x++, src += 4)
        {
            // 32-bit ARGB data in native endian format
            *dst32++ = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) | src[3];