CVSROOT: /sources/gnash Module name: gnash Changes by: Bastiaan Jacques <bjacques> 07/12/02 01:06:31
Modified files: . : ChangeLog backend : render_handler.h render_handler_agg.cpp render_handler_cairo.cpp render_handler_ogl.cpp server : render.cpp render.h Log message: Drop create_bitmap_info_alpha, since it is unused and none of the current renderers implement it. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5052&r2=1.5053 http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.52&r2=1.53 http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.119&r2=1.120 http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.33&r2=1.34 http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.98&r2=1.99 http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.cpp?cvsroot=gnash&r1=1.20&r2=1.21 http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.h?cvsroot=gnash&r1=1.18&r2=1.19 Patches: Index: ChangeLog =================================================================== RCS file: /sources/gnash/gnash/ChangeLog,v retrieving revision 1.5052 retrieving revision 1.5053 diff -u -b -r1.5052 -r1.5053 --- ChangeLog 2 Dec 2007 00:45:28 -0000 1.5052 +++ ChangeLog 2 Dec 2007 01:06:29 -0000 1.5053 @@ -1,3 +1,9 @@ +2007-12-01 Bastiaan Jacques <[EMAIL PROTECTED]> + + * backend/render_handler{.h,_ogl.cpp,_agg.cpp,_cairo.cpp}, + server/render.{h,cpp}: Drop create_bitmap_info_alpha, since it is + unused and none of the current renderers implement it. + 2007-12-01 Sandro Santilli <[EMAIL PROTECTED]> * testsuite/actionscript.all/Boolean.as: add test for Boolean() Index: backend/render_handler.h =================================================================== RCS file: /sources/gnash/gnash/backend/render_handler.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -b -r1.52 -r1.53 --- backend/render_handler.h 30 Nov 2007 23:11:10 -0000 1.52 +++ backend/render_handler.h 2 Dec 2007 01:06:30 -0000 1.53 @@ -18,7 +18,7 @@ // // -/* $Id: render_handler.h,v 1.52 2007/11/30 23:11:10 bjacques Exp $ */ +/* $Id: render_handler.h,v 1.53 2007/12/02 01:06:30 bjacques Exp $ */ #ifndef RENDER_HANDLER_H #define RENDER_HANDLER_H @@ -225,14 +225,6 @@ // Your handler should return these with a ref-count of 0. (@@ is that the right policy?) /// \brief - /// Create a bitmap_info so that it contains an alpha texture - /// with the given data (1 byte per texel). - // - /// Munges *data (in order to make mipmaps)!! - /// - virtual bitmap_info* create_bitmap_info_alpha(int w, int h, unsigned char* data) = 0; - - /// \brief /// Given an image, returns a pointer to a bitmap_info class /// that can later be passed to fill_styleX_bitmap(), to set a /// bitmap fill style. Index: backend/render_handler_agg.cpp =================================================================== RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -u -b -r1.119 -r1.120 --- backend/render_handler_agg.cpp 1 Dec 2007 22:49:18 -0000 1.119 +++ backend/render_handler_agg.cpp 2 Dec 2007 01:06:30 -0000 1.120 @@ -17,7 +17,7 @@ -/* $Id: render_handler_agg.cpp,v 1.119 2007/12/01 22:49:18 bjacques Exp $ */ +/* $Id: render_handler_agg.cpp,v 1.120 2007/12/02 01:06:30 bjacques Exp $ */ // Original version by Udo Giacomozzi and Hannes Mayr, // INDUNET GmbH (www.indunet.it) @@ -422,19 +422,6 @@ return new agg_bitmap_info<agg::pixfmt_rgb24_pre> (0, 0, 0, &dummy, 24); } - gnash::bitmap_info* create_bitmap_info_alpha(int /*w*/, int /*h*/, uint8_t* /*data*/) - // Create a bitmap_info so that it contains an alpha texture - // with the given data (1 byte per texel). - { - //return new agg_bitmap_info<agg::pixfmt_gray8> (w, h, w, data, 8); - - // where is this used, anyway?? - log_msg("create_bitmap_info_alpha() currently not supported"); - - return new bitmap_info(); - } - - void delete_bitmap_info(gnash::bitmap_info* bi) // Delete the given bitmap info class. { Index: backend/render_handler_cairo.cpp =================================================================== RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -u -b -r1.33 -r1.34 --- backend/render_handler_cairo.cpp 30 Nov 2007 23:11:10 -0000 1.33 +++ backend/render_handler_cairo.cpp 2 Dec 2007 01:06:31 -0000 1.34 @@ -22,7 +22,6 @@ // // TODOs: // - Implement focal gradients. -// - Implement alpha bitmaps. // - Implement unimplemented methods. // - Would be nice to have a header/implementation separation. // - Document workings of Cairo and this renderer. @@ -35,7 +34,7 @@ // Already implemented: // - outlines // - fills: solid, linear, radial and bitmap -// - bitmaps (excluding alpha) +// - bitmaps // - fonts // - masks // - video (from old Cairo renderer) @@ -202,13 +201,6 @@ { } - - virtual bitmap_info* create_bitmap_info_alpha(int w, int h, unsigned char* data) - { - log_unimpl("create_bitmap_info_alpha"); - return NULL; - } - virtual bitmap_info* create_bitmap_info_rgb(image::rgb* im) { int buf_size = im->width() * im->height() * 4; Index: backend/render_handler_ogl.cpp =================================================================== RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v retrieving revision 1.98 retrieving revision 1.99 diff -u -b -r1.98 -r1.99 --- backend/render_handler_ogl.cpp 30 Nov 2007 23:11:10 -0000 1.98 +++ backend/render_handler_ogl.cpp 2 Dec 2007 01:06:31 -0000 1.99 @@ -84,18 +84,14 @@ // TODO: -// - Implement: -// * Alpha images -// * Real antialiasing: Currently, we just draw an anti-aliased outline around -// solid shapes and fonts. Besides not anti-aliasing other types of shapes, -// this makes fonts a bit bigger than intended. -// // - Profiling! // - Optimize code: // * Use display lists // * Use better suited standard containers // * convert to double at a later stage (oglVertex) // * keep data for less time +// * implement hardware accelerated gradients. Most likely this will require +// the use of fragment shader language. // * The "Programming Tips" in the OpenGL "red book" discusses a coordinate system // that would give "exact two-dimensional rasterization". AGG uses a similar @@ -625,13 +621,6 @@ #endif } - - virtual bitmap_info* create_bitmap_info_alpha(int w, int h, unsigned char* data) - { - log_unimpl("create_bitmap_info_alpha()"); - return NULL; - } - virtual bitmap_info* create_bitmap_info_rgb(image::rgb* im) { return new bitmap_info_ogl(im, GL_RGB, ogl_accessible()); Index: server/render.cpp =================================================================== RCS file: /sources/gnash/gnash/server/render.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -u -b -r1.20 -r1.21 --- server/render.cpp 30 Nov 2007 23:11:11 -0000 1.20 +++ server/render.cpp 2 Dec 2007 01:06:31 -0000 1.21 @@ -48,15 +48,6 @@ bogus_bi() {} }; - bitmap_info* create_bitmap_info_alpha(int w, int h, unsigned char* data) - { -#ifdef DEBUG_RENDER_CALLS - GNASH_REPORT_FUNCTION; -#endif - if (s_render_handler) return s_render_handler->create_bitmap_info_alpha(w, h, data); - else return new bogus_bi; - } - bitmap_info* create_bitmap_info_rgb(image::rgb* im) { #ifdef DEBUG_RENDER_CALLS Index: server/render.h =================================================================== RCS file: /sources/gnash/gnash/server/render.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- server/render.h 30 Nov 2007 23:11:11 -0000 1.18 +++ server/render.h 2 Dec 2007 01:06:31 -0000 1.19 @@ -37,11 +37,6 @@ /// namespace render { - - /// See render_handler::create_bitmap_info_alpha (in backend/render_handler.h) - bitmap_info* create_bitmap_info_alpha(int w, int h, - unsigned char* data); - /// See render_handler::create_bitmap_info_rgb (in backend/render_handler.h) bitmap_info* create_bitmap_info_rgb(image::rgb* im); _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit