[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ... |
Date: |
Wed, 09 May 2007 09:54:44 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/09 09:54:44
Modified files:
. : ChangeLog
backend : render_handler_agg.cpp render_handler_agg.h
testsuite : MovieTester.cpp
Log message:
* testsuite/MovieTester.cpp (initTestingRenderers): try
initializing
an AGG renderer for *each* known pixel format.
* backend/render_handler_agg.{cpp,h}
(create_render_handler_agg):
Take pixelformat by *const* pointer, do NOT abort when the
given
pixelformat is unsupported, just return NULL.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3138&r2=1.3139
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3138
retrieving revision 1.3139
diff -u -b -r1.3138 -r1.3139
--- ChangeLog 9 May 2007 09:06:21 -0000 1.3138
+++ ChangeLog 9 May 2007 09:54:44 -0000 1.3139
@@ -1,5 +1,10 @@
2007-05-09 Sandro Santilli <address@hidden>
+ * testsuite/MovieTester.cpp (initTestingRenderers): try initializing
+ an AGG renderer for *each* known pixel format.
+ * backend/render_handler_agg.{cpp,h} (create_render_handler_agg):
+ Take pixelformat by *const* pointer, do NOT abort when the given
+ pixelformat is unsupported, just return NULL.
* testsuite/misc-ming.all/action_execution_order_test8.c:
Added description as reported on bug #19727.
* testsuite/misc-ming.all/static_vs_dynamic2.c:
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- backend/render_handler_agg.cpp 8 May 2007 17:38:06 -0000 1.79
+++ backend/render_handler_agg.cpp 9 May 2007 09:54:44 -0000 1.80
@@ -16,7 +16,7 @@
-/* $Id: render_handler_agg.cpp,v 1.79 2007/05/08 17:38:06 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.80 2007/05/09 09:54:44 strk Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -2021,7 +2021,7 @@
// TODO: Replace "pixelformat" with a enum!
-DSOEXPORT render_handler_agg_base* create_render_handler_agg(char
*pixelformat)
+DSOEXPORT render_handler_agg_base* create_render_handler_agg(const char
*pixelformat)
{
log_msg("framebuffer pixel format is %s", pixelformat);
@@ -2060,7 +2060,8 @@
#endif
{
log_error("Unknown pixelformat: %s\n", pixelformat);
- assert(0);
+ return NULL;
+ //assert(0);
}
return NULL; // avoid compiler warning
Index: backend/render_handler_agg.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- backend/render_handler_agg.h 20 Apr 2007 11:53:27 -0000 1.13
+++ backend/render_handler_agg.h 9 May 2007 09:54:44 -0000 1.14
@@ -58,8 +58,12 @@
/// Create a render handler
+//
+/// If the given pixelformat is unsupported, or any other error
+/// occurs, NULL is returned.
+///
DSOEXPORT render_handler_agg_base*
- create_render_handler_agg(char *pixelformat);
+ create_render_handler_agg(const char *pixelformat);
} // namespace gnash
Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- testsuite/MovieTester.cpp 4 May 2007 08:35:01 -0000 1.32
+++ testsuite/MovieTester.cpp 9 May 2007 09:54:44 -0000 1.33
@@ -361,10 +361,29 @@
#ifdef RENDERER_AGG
// Initialize AGG
- handler.reset( create_render_handler_agg("RGB24") );
- assert(handler.get());
- addTestingRenderer(handler, "AGG_RGB24");
-#endif
+ static const char* aggPixelFormats[] = {
+ "RGB555", "RGB565", "RGBA16",
+ "RGB24", "BGR24", "RGBA32", "BGRA32"
+ };
+
+ for (unsigned i=0; i<sizeof(aggPixelFormats)/sizeof(*aggPixelFormats);
++i)
+ {
+ const char* pixelFormat = aggPixelFormats[i];
+ std::string name = "AGG_"+string(pixelFormat);
+
+ handler.reset( create_render_handler_agg(pixelFormat) );
+ if ( handler.get() )
+ {
+ //log_msg("Renderer %s initialized", name.c_str());
+ cout << "Renderer " << name << " initialized" << endl;
+ addTestingRenderer(handler, name);
+ }
+ else
+ {
+ cout << "Renderer " << name << " not supported" << endl;
+ }
+ }
+#endif // RENDERER_AGG
#ifdef RENDERER_CAIRO
// Initialize Cairo
- [Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...,
Sandro Santilli <=