From: <ai...@us...> - 2010-02-17 21:41:09
|
Revision: 10804 http://plplot.svn.sourceforge.net/plplot/?rev=10804&view=rev Author: airwin Date: 2010-02-17 21:41:03 +0000 (Wed, 17 Feb 2010) Log Message: ----------- Style recent cairo changes. Modified Paths: -------------- trunk/drivers/cairo.c Modified: trunk/drivers/cairo.c =================================================================== --- trunk/drivers/cairo.c 2010-02-17 07:49:20 UTC (rev 10803) +++ trunk/drivers/cairo.c 2010-02-17 21:41:03 UTC (rev 10804) @@ -959,7 +959,7 @@ plP_fci2hex( fci, &fontWeight, PL_FCI_WEIGHT ); /* From http://library.gnome.org/devel/pango/unstable/PangoMarkupFormat.html * size = font size in 1024ths of a point. */ - snprintf( openTag, TAG_LEN, "<span font_desc=\"%s\" size=\"%d\" ", familyLookup[fontFamily], (int)( fontSize * 1024. ) ); + snprintf( openTag, TAG_LEN, "<span font_desc=\"%s\" size=\"%d\" ", familyLookup[fontFamily], (int) ( fontSize * 1024. ) ); strncat( pangoMarkupString, openTag, MAX_MARKUP_LEN - 1 - strlen( pangoMarkupString ) ); snprintf( openTag, TAG_LEN, "style=\"%s\" ", styleLookup[fontStyle] ); @@ -2681,9 +2681,9 @@ case WM_ERASEBKGND: if ( dev ) { - dev->oldcolour = SetBkColor( dev->hdc, RGB( pls->cmap0[0].r, pls->cmap0[0].g, pls->cmap0[0].b ) ); - ExtTextOut( dev->hdc, 0, 0, ETO_OPAQUE, &dev->rect, "", 0, 0 ); - SetBkColor( dev->hdc, dev->oldcolour ); + dev->oldcolour = SetBkColor( dev->hdc, RGB( pls->cmap0[0].r, pls->cmap0[0].g, pls->cmap0[0].b ) ); + ExtTextOut( dev->hdc, 0, 0, ETO_OPAQUE, &dev->rect, "", 0, 0 ); + SetBkColor( dev->hdc, dev->oldcolour ); } return ( 1 ); break; @@ -2927,7 +2927,7 @@ switch ( op ) { case PLESC_FLUSH: - InvalidateRect( aStream->hwnd, NULL, TRUE); + InvalidateRect( aStream->hwnd, NULL, TRUE ); break; case PLESC_GETC: break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |