CVSROOT: /cvsroot/gnash Module name: gnash Changes by: Udo Giacomozzi <udog> 07/02/23 09:50:36
Modified files: . : ChangeLog backend : render_handler_agg.cpp Log message: Use PIXELFORMAT_xxx defines introduced by Rob CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2440&r2=1.2441 http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.60&r2=1.61 Patches: Index: ChangeLog =================================================================== RCS file: /cvsroot/gnash/gnash/ChangeLog,v retrieving revision 1.2440 retrieving revision 1.2441 diff -u -b -r1.2440 -r1.2441 --- ChangeLog 22 Feb 2007 18:55:23 -0000 1.2440 +++ ChangeLog 23 Feb 2007 09:50:36 -0000 1.2441 @@ -1,3 +1,8 @@ +2007-02-23 Udo Giacomozzi <[EMAIL PROTECTED]> + + * backend/render_handler_agg.cpp: Use PIXELFORMAT_xxx defines + introduced by Rob + 2007-02-22 Rob Savoye <[EMAIL PROTECTED]> * configure.ac: Set the pixel type when using AGG for better Index: backend/render_handler_agg.cpp =================================================================== RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -u -b -r1.60 -r1.61 --- backend/render_handler_agg.cpp 22 Feb 2007 10:43:04 -0000 1.60 +++ backend/render_handler_agg.cpp 23 Feb 2007 09:50:36 -0000 1.61 @@ -16,7 +16,7 @@ -/* $Id: render_handler_agg.cpp,v 1.60 2007/02/22 10:43:04 udog Exp $ */ +/* $Id: render_handler_agg.cpp,v 1.61 2007/02/23 09:50:36 udog Exp $ */ // Original version by Udo Giacomozzi and Hannes Mayr, // INDUNET GmbH (www.indunet.it) @@ -1534,25 +1534,39 @@ log_msg("framebuffer pixel format is %s", pixelformat); +#ifdef PIXELFORMAT_RGB555 if (!strcmp(pixelformat, "RGB555")) return new render_handler_agg<agg::pixfmt_rgb555_pre> (16); // yep, 16! - else if (!strcmp(pixelformat, "RGB565") || !strcmp(pixelformat, "RGBA16")) + else +#endif +#ifdef PIXELFORMAT_RGB565 + if (!strcmp(pixelformat, "RGB565") || !strcmp(pixelformat, "RGBA16")) return new render_handler_agg<agg::pixfmt_rgb565_pre> (16); - - else if (!strcmp(pixelformat, "RGB24")) + else +#endif +#ifdef PIXELFORMAT_RGB24 + if (!strcmp(pixelformat, "RGB24")) return new render_handler_agg<agg::pixfmt_rgb24_pre> (24); - - else if (!strcmp(pixelformat, "BGR24")) + else +#endif +#ifdef PIXELFORMAT_BGR24 + if (!strcmp(pixelformat, "BGR24")) return new render_handler_agg<agg::pixfmt_bgr24_pre> (24); - - else if (!strcmp(pixelformat, "RGBA32")) + else +#endif +#ifdef PIXELFORMAT_RGBA32 + if (!strcmp(pixelformat, "RGBA32")) return new render_handler_agg<agg::pixfmt_rgba32_pre> (32); - - else if (!strcmp(pixelformat, "BGRA32")) + else +#endif +#ifdef PIXELFORMAT_BGRA32 + if (!strcmp(pixelformat, "BGRA32")) return new render_handler_agg<agg::pixfmt_bgra32_pre> (32); - else { + else +#endif + { log_error("Unknown pixelformat: %s\n", pixelformat); assert(0); } _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit