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

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/10/18 23:14:18

Modified files:
        .              : ChangeLog 
        backend        : render_handler_cairo.cpp 

Log message:
        initTestBuffer: fix a set of
                typos to allow the testsuite to actually test the renderer. No
                XFAILs so far; one XPASS (masks_test2runner.cpp:58).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4637&r2=1.4638
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4637
retrieving revision 1.4638
diff -u -b -r1.4637 -r1.4638
--- ChangeLog   18 Oct 2007 18:54:32 -0000      1.4637
+++ ChangeLog   18 Oct 2007 23:14:17 -0000      1.4638
@@ -1,3 +1,9 @@
+2007-10-18 Bastiaan Jacques <address@hidden>
+
+       * backend/render_handler_cairo.cpp: initTestBuffer: fix a set of
+       typos to allow the testsuite to actually test the renderer. No
+       XFAILs so far; one XPASS (masks_test2runner.cpp:58).
+
 2007-10-18 Sandro Santilli <address@hidden>
 
        * server/edit_text_character.{cpp,h}: send onSetFocus and onKillFocus

Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- backend/render_handler_cairo.cpp    18 Oct 2007 11:23:22 -0000      1.26
+++ backend/render_handler_cairo.cpp    18 Oct 2007 23:14:18 -0000      1.27
@@ -874,7 +874,7 @@
     
     cairo_t* context = cairo_create(test_surface);
     
-    if (cairo_status(context) != CAIRO_STATUS_NO_MEMORY) {    
+    if (cairo_status(context) == CAIRO_STATUS_NO_MEMORY) {    
       return false;    
     }
     
@@ -917,18 +917,18 @@
     unsigned char* data = cairo_image_surface_get_data (surface);
     int width = cairo_image_surface_get_width(surface);
     int height = cairo_image_surface_get_height(surface);
-    int stride = cairo_image_surface_get_stride(surface);
+    int stride = cairo_image_surface_get_stride(surface); // in bytes
     
     if (x >= width || y >= height) {    
       return false;
     }
     
-    unsigned char* ptr = data + x * stride + y * 4;
+    unsigned char* ptr = data + y * stride + x * 4;
     
-    color_return.m_a = ptr[0];
-    color_return.m_r = ptr[1];
-    color_return.m_g = ptr[2];
-    color_return.m_b = ptr[3];
+    color_return.m_a = ptr[3];
+    color_return.m_r = ptr[2];
+    color_return.m_g = ptr[1];
+    color_return.m_b = ptr[0];
 
     return true;
   }