[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ... |
|
Date: |
Wed, 11 Apr 2007 17:54:23 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 07/04/11 17:54:22
Modified files:
. : ChangeLog
backend : render_handler_ogl.cpp sound_handler.h
libbase : container.cpp container.h image.cpp
triangulate.h triangulate_impl.h
triangulate_sint32.cpp tu_file.h tu_random.cpp
tu_swap.h tu_timer.cpp tu_timer.h tu_types.cpp
tu_types.h
libgeometry : geometry.cpp kd_tree_packed.cpp
plugin : plugin.cpp plugin.h
plugin/win32 : plugin.cpp plugin.h
server : as_value.h execute_tag.h sprite_instance.cpp
swf_function.h textformat.cpp textformat.h
timers.cpp timers.h
server/asobj : NetStreamFfmpeg.cpp NetStreamFfmpeg.h
SoundFfmpeg.h SoundGst.h SoundMad.h
server/parser : action_buffer.cpp movie_def_impl.h
server/swf : PlaceObject2Tag.cpp PlaceObject2Tag.h
server/vm : ASHandlers.cpp
Log message:
Replace SDL integer type names by standard ones.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2852&r2=1.2853
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_sint32.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_random.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/geometry.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_packed.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/execute_tag.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.86&r2=1.87
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2852
retrieving revision 1.2853
diff -u -b -r1.2852 -r1.2853
--- ChangeLog 11 Apr 2007 17:44:35 -0000 1.2852
+++ ChangeLog 11 Apr 2007 17:54:21 -0000 1.2853
@@ -64,6 +64,7 @@
video image if it extends beyond the width of our buffer.
* gui/fltk.cpp: Fix compilation by adding statics for GUI methods
that became nonstatic. Also fix some warnings.
+ * all over the place: Replace SDL integer type names by standard ones.
2007-04-11 Sandro Santilli <address@hidden>
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- backend/render_handler_ogl.cpp 10 Apr 2007 18:18:45 -0000 1.71
+++ backend/render_handler_ogl.cpp 11 Apr 2007 17:54:21 -0000 1.72
@@ -5,7 +5,7 @@
// A render_handler that uses SDL & OpenGL
-/* $Id: render_handler_ogl.cpp,v 1.71 2007/04/10 18:18:45 rsavoye Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.72 2007/04/11 17:54:21 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -910,7 +910,7 @@
*/
-void hardware_resample(int bytes_per_pixel, int src_width, int src_height,
uint8* src_data, int dst_width, int dst_height)
+void hardware_resample(int bytes_per_pixel, int src_width, int src_height,
uint8_t* src_data, int dst_width, int dst_height)
// Code from Alex Streit
//
// Sets the current texture to a resampled/expanded version of the
@@ -967,7 +967,7 @@
int src_width,
int src_height,
int src_pitch,
- uint8* src_data,
+ uint8_t* src_data,
int dst_width,
int dst_height)
// Code from Alex Streit
Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- backend/sound_handler.h 27 Feb 2007 09:54:48 -0000 1.2
+++ backend/sound_handler.h 11 Apr 2007 17:54:21 -0000 1.3
@@ -17,7 +17,7 @@
//
//
-/* $Id: sound_handler.h,v 1.2 2007/02/27 09:54:48 strk Exp $ */
+/* $Id: sound_handler.h,v 1.3 2007/04/11 17:54:21 bjacques Exp $ */
/// \page sound_handler_intro Sound handler introduction
///
@@ -52,7 +52,7 @@
{
public:
- typedef bool (*aux_streamer_ptr)(void *udata, uint8 *stream, int len);
+ typedef bool (*aux_streamer_ptr)(void *udata, uint8_t *stream, int len);
struct sound_envelope
{
Index: libbase/container.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/container.cpp 17 Sep 2006 19:45:59 -0000 1.12
+++ libbase/container.cpp 11 Apr 2007 17:54:21 -0000 1.13
@@ -17,18 +17,18 @@
#include "utf8.h"
#include "tu_random.h"
-void tu_string::append_wide_char(uint16 c)
+void tu_string::append_wide_char(uint16_t c)
{
char buf[8];
int index = 0;
- utf8::encode_unicode_character(buf, &index, (uint32) c);
+ utf8::encode_unicode_character(buf, &index, (uint32_t) c);
buf[index] = '\0';
*this += buf;
}
-void tu_string::append_wide_char(uint32 c)
+void tu_string::append_wide_char(uint32_t c)
{
char buf[8];
int index = 0;
@@ -160,15 +160,15 @@
assert(result->length() == (int) strlen(result->c_str()));
}
-void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32* wstr)
+void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr)
{
- encode_utf8_from_wchar_generic<uint32>(result, wstr);
+ encode_utf8_from_wchar_generic<uint32_t>(result, wstr);
}
-void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16* wstr)
+void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr)
{
- encode_utf8_from_wchar_generic<uint16>(result, wstr);
+ encode_utf8_from_wchar_generic<uint16_t>(result, wstr);
}
@@ -178,10 +178,10 @@
}
-uint32 tu_string::utf8_char_at(int index) const
+uint32_t tu_string::utf8_char_at(int index) const
{
const char* buf = get_buffer();
- uint32 c;
+ uint32_t c;
do
{
@@ -207,7 +207,7 @@
tu_string str;
for (;;)
{
- uint32 c = utf8::decode_next_unicode_character(&buf);
+ uint32_t c = utf8::decode_next_unicode_character(&buf);
if (c == 0)
{
@@ -227,7 +227,7 @@
tu_string str;
for (;;)
{
- uint32 c = utf8::decode_next_unicode_character(&buf);
+ uint32_t c = utf8::decode_next_unicode_character(&buf);
if (c == 0) {
// We've hit the end of the string; don't go further.
@@ -247,7 +247,7 @@
while (p - buf < buflen)
{
- uint32 c = utf8::decode_next_unicode_character(&p);
+ uint32_t c = utf8::decode_next_unicode_character(&p);
if (c == 0)
{
break;
@@ -282,7 +282,7 @@
start_pointer = p;
}
- uint32 c = utf8::decode_next_unicode_character(&p);
+ uint32_t c = utf8::decode_next_unicode_character(&p);
index++;
if (index == end)
@@ -424,23 +424,23 @@
// still 33% slower in my tests.
// // tu's hash
-#define HASH hash<uint32, uint32 >
+#define HASH hash<uint32_t, uint32_t >
#define HASH_ADD(h, k, v) h.add(k, v)
// STL's hash
-//#define HASH __gnu_cxx::hash_map<uint32, uint32>
-//#define HASH std::hash_map<uint32, uint32>
+//#define HASH __gnu_cxx::hash_map<uint32_t, uint32_t>
+//#define HASH std::hash_map<uint32_t, uint32_t>
//#define HASH_ADD(h, k, v) h[k] = v
// STL's map
-//#define HASH std::map<uint32, uint32>
+//#define HASH std::map<uint32_t, uint32_t>
//#define HASH_ADD(h, k, v) h[k] = v
// const int SIZE = 10000000;
const int SIZE = 1000000;
// Make an array of random numbers.
- std::vector<uint32> numbers;
+ std::vector<uint32_t> numbers;
numbers.resize(SIZE);
for (int i = 0, n = numbers.size(); i < n; i++)
Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- libbase/container.h 12 Feb 2007 01:32:46 -0000 1.51
+++ libbase/container.h 11 Apr 2007 17:54:21 -0000 1.52
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: container.h,v 1.51 2007/02/12 01:32:46 nihilus Exp $ */
+/* $Id: container.h,v 1.52 2007/04/11 17:54:21 bjacques Exp $ */
#ifndef __CONTAINER_H__
#define __CONTAINER_H__
@@ -736,14 +736,14 @@
resize(str.size());
strcpy(get_buffer(), str.get_buffer());
}
- tu_string(const uint32* wide_char_str)
+ tu_string(const uint32_t* wide_char_str)
{
m_local.m_size = 1;
m_local.m_buffer[0] = '\0';
*this = wide_char_str;
}
- tu_string(const uint16* wide_char_str)
+ tu_string(const uint16_t* wide_char_str)
{
m_local.m_size = 1;
m_local.m_buffer[0] = '\0';
@@ -850,8 +850,8 @@
}
// Append wide char. Both versions of wide char.
- void append_wide_char(uint16 ch);
- void append_wide_char(uint32 ch);
+ void append_wide_char(uint16_t ch);
+ void append_wide_char(uint32_t ch);
void operator+=(const tu_string& str)
{
@@ -901,8 +901,8 @@
//
// Could add operator= overloads, but maybe it's better to
// keep this very explicit.
- static void encode_utf8_from_wchar(tu_string* result, const uint32*
wstr);
- static void encode_utf8_from_wchar(tu_string* result, const uint16*
wstr);
+ static void encode_utf8_from_wchar(tu_string* result, const
uint32_t* wstr);
+ static void encode_utf8_from_wchar(tu_string* result, const
uint16_t* wstr);
// Utility: case-insensitive string compare. stricmp() is not
// ANSI or POSIX, doesn't seem to appear in Linux.
@@ -910,7 +910,7 @@
// Return the Unicode char at the specified character
// position. index is in UTF-8 chars, NOT bytes.
- uint32 utf8_char_at(int index) const;
+ uint32_t utf8_char_at(int index) const;
// Return the string in this container as all upper case letters
tu_string utf8_to_upper() const;
Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/image.cpp 10 Apr 2007 20:24:23 -0000 1.18
+++ libbase/image.cpp 11 Apr 2007 17:54:21 -0000 1.19
@@ -424,7 +424,7 @@
for (int y = 0; y < im->m_height; y++)
{
- uint8* p = scanline(im, y);
+ uint8_t* p = scanline(im, y);
for (int x = 0; x < im->m_width; x++)
{
out->write_byte(p[x * 4]);
Index: libbase/triangulate.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/triangulate.h 25 Feb 2006 03:54:03 -0000 1.3
+++ libbase/triangulate.h 11 Apr 2007 17:54:21 -0000 1.4
@@ -37,19 +37,19 @@
// Version using short coords
void compute(
- std::vector<sint16>* results, // indexed trilist
+ std::vector<int16_t>* results, // indexed trilist
int path_count,
- const std::vector<sint16> paths[],
+ const std::vector<int16_t> paths[],
int debug_halt_step = -1,
- std::vector<sint16>* debug_remaining_loop = NULL);
+ std::vector<int16_t>* debug_remaining_loop = NULL);
// Version using int coords
void compute(
- std::vector<sint32>* results, // indexed trilist
+ std::vector<int32_t>* results, // indexed trilist
int path_count,
- const std::vector<sint32> paths[],
+ const std::vector<int32_t> paths[],
int debug_halt_step = -1,
- std::vector<sint32>* debug_remaining_loop = NULL);
+ std::vector<int32_t>* debug_remaining_loop = NULL);
}
Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libbase/triangulate_impl.h 12 Oct 2006 14:05:42 -0000 1.21
+++ libbase/triangulate_impl.h 11 Apr 2007 17:54:21 -0000 1.22
@@ -24,7 +24,7 @@
// code, see the FIST web page at:
// http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
-/* $Id: triangulate_impl.h,v 1.21 2006/10/12 14:05:42 nihilus Exp $ */
+/* $Id: triangulate_impl.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
#include "utility.h"
#include "triangulate.h"
@@ -37,7 +37,7 @@
#include "tu_timer.h"
#endif // PROFILE_TRIANGULATE
-// Template this whole thing on coord_t, so sint16 and float versions
+// Template this whole thing on coord_t, so int16_t and float versions
// can easily reuse the code.
//
// These templates are instantiated in triangulate_<type>.cpp files.
@@ -72,10 +72,10 @@
}
-inline sint64 determinant_sint32(const vec2<sint32>& a, const vec2<sint32>&
b, const vec2<sint32>& c)
+inline int64_t determinant_sint32(const vec2<int32_t>& a, const vec2<int32_t>&
b, const vec2<int32_t>& c)
{
- return (sint64(b.x) - sint64(a.x)) * (sint64(c.y) - sint64(a.y))
- - (sint64(b.y) - sint64(a.y)) * (sint64(c.x) - sint64(a.x));
+ return (int64_t(b.x) - int64_t(a.x)) * (int64_t(c.y) - int64_t(a.y))
+ - (int64_t(b.y) - int64_t(a.y)) * (int64_t(c.x) - int64_t(a.x));
}
@@ -101,10 +101,10 @@
template<>
-inline int vertex_left_test(const vec2<sint32>& a, const vec2<sint32>& b,
const vec2<sint32>& c)
-// Specialize for vec2<sint32>
+inline int vertex_left_test(const vec2<int32_t>& a, const vec2<int32_t>&
b, const vec2<int32_t>& c)
+// Specialize for vec2<int32_t>
{
- sint64 det = determinant_sint32(a, b, c);
+ int64_t det = determinant_sint32(a, b, c);
if (det > 0) return 1;
else if (det < 0) return -1;
else return 0;
@@ -298,10 +298,10 @@
template<>
-inline bool edges_intersect_sub(const std::vector<poly_vert<sint32> >&
sorted_verts, int e0v0i, int e0v1i, int e1v0i, int e1v1i)
+inline bool edges_intersect_sub(const std::vector<poly_vert<int32_t> >&
sorted_verts, int e0v0i, int e0v1i, int e1v0i, int e1v1i)
// Return true if edge (e0v0,e0v1) intersects (e1v0,e1v1).
//
-// Specialized for sint32
+// Specialized for int32_t
{
// If e1v0,e1v1 are on opposite sides of e0, and e0v0,e0v1 are
// on opposite sides of e1, then the segments cross. These
@@ -312,10 +312,10 @@
//
// If only one is degenerate, our tests are still OK.
- const vec2<sint32>& e0v0 = sorted_verts[e0v0i].m_v;
- const vec2<sint32>& e0v1 = sorted_verts[e0v1i].m_v;
- const vec2<sint32>& e1v0 = sorted_verts[e1v0i].m_v;
- const vec2<sint32>& e1v1 = sorted_verts[e1v1i].m_v;
+ const vec2<int32_t>& e0v0 = sorted_verts[e0v0i].m_v;
+ const vec2<int32_t>& e0v1 = sorted_verts[e0v1i].m_v;
+ const vec2<int32_t>& e1v0 = sorted_verts[e1v0i].m_v;
+ const vec2<int32_t>& e1v1 = sorted_verts[e1v1i].m_v;
if (e0v0.x == e0v1.x && e0v0.y == e0v1.y)
{
@@ -330,8 +330,8 @@
}
// See if e1 crosses line of e0.
- sint64 det10 = determinant_sint32(e0v0, e0v1, e1v0);
- sint64 det11 = determinant_sint32(e0v0, e0v1, e1v1);
+ int64_t det10 = determinant_sint32(e0v0, e0v1, e1v0);
+ int64_t det11 = determinant_sint32(e0v0, e0v1, e1v1);
// Note: we do > 0, which means a vertex on a line counts as
// intersecting. In general, if one vert is on the other
@@ -346,8 +346,8 @@
}
// See if e0 crosses line of e1.
- sint64 det00 = determinant_sint32(e1v0, e1v1, e0v0);
- sint64 det01 = determinant_sint32(e1v0, e1v1, e0v1);
+ int64_t det00 = determinant_sint32(e1v0, e1v1, e0v0);
+ int64_t det01 = determinant_sint32(e1v0, e1v1, e0v1);
if (det00 * det01 > 0)
{
@@ -2222,7 +2222,7 @@
}
#ifdef PROFILE_TRIANGULATE
- uint64 start_ticks = tu_timer::get_profile_ticks();
+ uint64_t start_ticks = tu_timer::get_profile_ticks();
#endif // PROFILE_TRIANGULATE
// Local generator, for some parts of the algo that need random numbers.
@@ -2244,7 +2244,7 @@
}
#ifdef PROFILE_TRIANGULATE
- uint64 join_ticks = tu_timer::get_profile_ticks();
+ uint64_t join_ticks = tu_timer::get_profile_ticks();
fprintf(stderr, "join poly = %1.6f sec\n",
tu_timer::profile_ticks_to_seconds(join_ticks - start_ticks));
#endif // PROFILE_TRIANGULATE
@@ -2377,7 +2377,7 @@
}
#ifdef PROFILE_TRIANGULATE
- uint64 clip_ticks = tu_timer::get_profile_ticks();
+ uint64_t clip_ticks = tu_timer::get_profile_ticks();
fprintf(stderr, "clip poly = %1.6f sec\n",
tu_timer::profile_ticks_to_seconds(clip_ticks - join_ticks));
fprintf(stderr, "total for poly = %1.6f sec\n",
tu_timer::profile_ticks_to_seconds(clip_ticks - start_ticks));
fprintf(stderr, "vert count = %d, verts clipped / sec = %f\n",
Index: libbase/triangulate_sint32.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_sint32.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/triangulate_sint32.cpp 10 Feb 2007 18:33:03 -0000 1.5
+++ libbase/triangulate_sint32.cpp 11 Apr 2007 17:54:21 -0000 1.6
@@ -7,7 +7,7 @@
//
// Instantiate our templated algo from triangulate_inst.h
-/* $Id: triangulate_sint32.cpp,v 1.5 2007/02/10 18:33:03 nihilus Exp $ */
+/* $Id: triangulate_sint32.cpp,v 1.6 2007/04/11 17:54:21 bjacques Exp $ */
#include "triangulate_impl.h"
@@ -15,14 +15,14 @@
namespace triangulate
{
- // Version using sint32 coords
+ // Version using int32_t coords
void compute(
- std::vector<sint32>* result, // trilist
+ std::vector<int32_t>* result, // trilist
int path_count,
- const std::vector<sint32> paths[],
+ const std::vector<int32_t> paths[],
int debug_halt_step /* = -1 */,
- std::vector<sint32>* debug_remaining_loop /* = NULL */)
+ std::vector<int32_t>* debug_remaining_loop /* = NULL */)
{
- compute_triangulation<sint32>(result, path_count, paths,
debug_halt_step, debug_remaining_loop);
+ compute_triangulation<int32_t>(result, path_count, paths,
debug_halt_step, debug_remaining_loop);
}
}
Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/tu_file.h 9 Mar 2007 14:38:29 -0000 1.11
+++ libbase/tu_file.h 11 Apr 2007 17:54:21 -0000 1.12
@@ -87,16 +87,16 @@
// Returns number of bytes copied.
int copy_bytes(tu_file* in, int bytes);
- uint64 read_le64();
+ uint64_t read_le64();
uint32_t read_le32();
uint16_t read_le16();
- uint64 read_be64();
+ uint64_t read_be64();
uint32_t read_be32();
uint16_t read_be16();
- void write_le64(uint64 u);
+ void write_le64(uint64_t u);
void write_le32(uint32_t u);
void write_le16(uint16_t u);
- void write_be64(uint64 u);
+ void write_be64(uint64_t u);
void write_be32(uint32_t u);
void write_be16(uint16_t u);
@@ -146,8 +146,8 @@
private:
- uint64 read64() {
- uint64 u;
+ uint64_t read64() {
+ uint64_t u;
m_read(&u, 8, m_data);
return u;
}
@@ -167,7 +167,7 @@
return u;
}
- void write64(uint64 u) {
+ void write64(uint64_t u) {
m_write(&u, 8, m_data);
}
void write32(uint32_t u) {
@@ -201,29 +201,29 @@
#if _TU_LITTLE_ENDIAN_
-inline uint64 tu_file::read_le64() { return read64(); }
+inline uint64_t tu_file::read_le64() { return read64(); }
inline uint32_t tu_file::read_le32() { return read32(); }
inline uint16_t tu_file::read_le16() { return read16(); }
-inline uint64 tu_file::read_be64() { return swap64(read64()); }
+inline uint64_t tu_file::read_be64() { return swap64(read64()); }
inline uint32_t tu_file::read_be32() { return swap32(read32()); }
inline uint16_t tu_file::read_be16() { return swap16(read16()); }
-inline void tu_file::write_le64(uint64 u) { write64(u); }
+inline void tu_file::write_le64(uint64_t u) { write64(u); }
inline void tu_file::write_le32(uint32_t u) { write32(u); }
inline void tu_file::write_le16(uint16_t u) { write16(u); }
-inline void tu_file::write_be64(uint64 u) { write64(swap64(u)); }
+inline void tu_file::write_be64(uint64_t u) { write64(swap64(u)); }
inline void tu_file::write_be32(uint32_t u) { write32(swap32(u)); }
inline void tu_file::write_be16(uint16_t u) { write16(swap16(u)); }
#else // not _TU_LITTLE_ENDIAN_
-inline uint64 tu_file::read_le64() { return swap64(read64()); }
+inline uint64_t tu_file::read_le64() { return swap64(read64()); }
inline uint32_t tu_file::read_le32() { return swap32(read32()); }
inline uint16_t tu_file::read_le16() { return swap16(read16()); }
-inline uint64 tu_file::read_be64() { return read64(); }
+inline uint64_t tu_file::read_be64() { return read64(); }
inline uint32_t tu_file::read_be32() { return read32(); }
inline uint16_t tu_file::read_be16() { return read16(); }
-inline void tu_file::write_le64(uint64 u) { write64(swap64(u)); }
+inline void tu_file::write_le64(uint64_t u) { write64(swap64(u)); }
inline void tu_file::write_le32(uint32_t u) { write32(swap32(u)); }
inline void tu_file::write_le16(uint16_t u) { write16(swap16(u)); }
-inline void tu_file::write_be64(uint64 u) { write64(u); }
+inline void tu_file::write_be64(uint64_t u) { write64(u); }
inline void tu_file::write_be32(uint32_t u) { write32(u); }
inline void tu_file::write_be16(uint16_t u) { write16(u); }
#endif // not _TU_LITTLE_ENDIAN_
@@ -262,7 +262,7 @@
{
union {
double d;
- uint64 l;
+ uint64_t l;
} u;
compiler_assert(sizeof(u) == sizeof(u.l));
@@ -276,7 +276,7 @@
{
union {
double d;
- uint64 l;
+ uint64_t l;
} u;
compiler_assert(sizeof(u) == sizeof(u.l));
Index: libbase/tu_random.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_random.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_random.cpp 28 Aug 2006 11:07:14 -0000 1.6
+++ libbase/tu_random.cpp 11 Apr 2007 17:54:21 -0000 1.7
@@ -52,14 +52,14 @@
// random number generator. _Statistics and Probability Letters
// 8_ (1990), 35-39.
-// const uint64 a = 123471786; // for SEED_COUNT=1024
-// const uint64 a = 123554632; // for SEED_COUNT=512
-// const uint64 a = 8001634; // for SEED_COUNT=255
-// const uint64 a = 8007626; // for SEED_COUNT=128
-// const uint64 a = 647535442; // for SEED_COUNT=64
-// const uint64 a = 547416522; // for SEED_COUNT=32
-// const uint64 a = 487198574; // for SEED_COUNT=16
- const uint64 a = 716514398; // for SEED_COUNT=8
+// const uint64_t a = 123471786; // for SEED_COUNT=1024
+// const uint64_t a = 123554632; // for SEED_COUNT=512
+// const uint64_t a = 8001634; // for SEED_COUNT=255
+// const uint64_t a = 8007626; // for SEED_COUNT=128
+// const uint64_t a = 647535442; // for SEED_COUNT=64
+// const uint64_t a = 547416522; // for SEED_COUNT=32
+// const uint64_t a = 487198574; // for SEED_COUNT=16
+ const uint64_t a = 716514398; // for SEED_COUNT=8
generator::generator()
@@ -89,7 +89,7 @@
uint32_t generator::next_random()
// Return the next pseudo-random number in the sequence.
{
- uint64 t;
+ uint64_t t;
uint32_t x;
//static uint32_t c = 362436;
Index: libbase/tu_swap.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_swap.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_swap.h 27 Jul 2006 08:37:45 -0000 1.6
+++ libbase/tu_swap.h 11 Apr 2007 17:54:21 -0000 1.7
@@ -52,7 +52,7 @@
#ifdef swap64
#undef swap64
#endif
-inline uint64 swap64(uint64 u)
+inline uint64_t swap64(uint64_t u)
{
#ifdef __GNUC__
return ((u & 0x00000000000000FFLL) << 56) |
@@ -76,7 +76,7 @@
}
-inline uint64 swap_le64(uint64 le_64)
+inline uint64_t swap_le64(uint64_t le_64)
// Given a 64-bit little-endian piece of data, return it as a 64-bit
// integer in native endian-ness. I.e., do a swap if we're on a
// big-endian machine.
Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/tu_timer.cpp 25 Aug 2006 23:35:20 -0000 1.5
+++ libbase/tu_timer.cpp 11 Apr 2007 17:54:21 -0000 1.6
@@ -15,19 +15,19 @@
#include <Mmsystem.h>
-uint64 tu_timer::get_ticks()
+uint64_t tu_timer::get_ticks()
{
return timeGetTime();
}
-double tu_timer::ticks_to_seconds(uint64 ticks)
+double tu_timer::ticks_to_seconds(uint64_t ticks)
{
return ticks * (1.0f / 1000.f);
}
-uint64 tu_timer::get_profile_ticks()
+uint64_t tu_timer::get_profile_ticks()
{
// @@ use rdtsc?
@@ -38,7 +38,7 @@
}
-double tu_timer::profile_ticks_to_seconds(uint64 ticks)
+double tu_timer::profile_ticks_to_seconds(uint64_t ticks)
{
LARGE_INTEGER freq;
QueryPerformanceFrequency(&freq);
@@ -59,19 +59,19 @@
// The profile ticks implementation is just fine for a normal timer.
-uint64 tu_timer::get_ticks()
+uint64_t tu_timer::get_ticks()
{
return get_profile_ticks();
}
-double tu_timer::ticks_to_seconds(uint64 ticks)
+double tu_timer::ticks_to_seconds(uint64_t ticks)
{
return profile_ticks_to_seconds(ticks);
}
-uint64 tu_timer::get_profile_ticks()
+uint64_t tu_timer::get_profile_ticks()
{
// @@ TODO prefer rdtsc when available?
@@ -80,14 +80,14 @@
gettimeofday(&tv, 0);
- uint64 result = tv.tv_sec * 1000000;
+ uint64_t result = tv.tv_sec * 1000000;
result += tv.tv_usec;
return result;
}
-double tu_timer::profile_ticks_to_seconds(uint64 ticks)
+double tu_timer::profile_ticks_to_seconds(uint64_t ticks)
{
// ticks is microseconds. Convert to seconds.
return ticks / 1000000.0;
Index: libbase/tu_timer.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/tu_timer.h 14 Sep 2006 23:54:22 -0000 1.3
+++ libbase/tu_timer.h 11 Apr 2007 17:54:21 -0000 1.4
@@ -16,8 +16,8 @@
{
// General-purpose wall-clock timer. May not be hi-res enough
// for profiling.
- uint64 get_ticks();
- double ticks_to_seconds(uint64 ticks);
+ uint64_t get_ticks();
+ double ticks_to_seconds(uint64_t ticks);
// Hi-res timer for CPU profiling.
@@ -26,10 +26,10 @@
// operation, and pass the difference to
// profile_ticks_to_seconds() to find out how long the
// operation took.
- DSOEXPORT uint64 get_profile_ticks();
+ DSOEXPORT uint64_t get_profile_ticks();
// Convert a hi-res ticks value into seconds.
- DSOEXPORT double profile_ticks_to_seconds(uint64 profile_ticks);
+ DSOEXPORT double profile_ticks_to_seconds(uint64_t
profile_ticks);
}
Index: libbase/tu_types.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/tu_types.cpp 8 May 2006 21:12:24 -0000 1.4
+++ libbase/tu_types.cpp 11 Apr 2007 17:54:21 -0000 1.5
@@ -17,11 +17,11 @@
if (sizeof(uint8_t) != 1
|| sizeof(uint16_t) != 2
|| sizeof(uint32_t) != 4
- || sizeof(uint64) != 8
+ || sizeof(uint64_t) != 8
|| sizeof(int8_t) != 1
|| sizeof(int16_t) != 2
|| sizeof(int32_t) != 4
- || sizeof(sint64) != 8)
+ || sizeof(int64_t) != 8)
{
// No good.
assert(0);
Index: libbase/tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libbase/tu_types.h 9 Feb 2007 17:23:03 -0000 1.32
+++ libbase/tu_types.h 11 Apr 2007 17:54:21 -0000 1.33
@@ -17,7 +17,7 @@
//
//
-/* $Id: tu_types.h,v 1.32 2007/02/09 17:23:03 bjacques Exp $ */
+/* $Id: tu_types.h,v 1.33 2007/04/11 17:54:21 bjacques Exp $ */
#ifndef TU_TYPES_H
#define TU_TYPES_H
@@ -79,22 +79,6 @@
# undef _TU_LITTLE_ENDIAN_
#endif //BYTE_ORDER == SDL_LIL_ENDIAN
-typedef uint8_t uint8;
-typedef int8_t sint8;
-typedef int8_t int8;
-typedef uint16_t uint16;
-typedef int16_t sint16;
-typedef int16_t int16;
-typedef uint32_t uint32;
-typedef int32_t sint32;
-typedef int32_t int32;
-
-#ifndef PROTYPES_H
-typedef uint64_t uint64;
-typedef int64_t sint64;
-typedef int64_t int64;
-#endif
-
// A function to run some validation checks.
DSOEXPORT bool tu_types_validate();
Index: libgeometry/geometry.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/geometry.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libgeometry/geometry.cpp 10 Feb 2007 18:40:20 -0000 1.8
+++ libgeometry/geometry.cpp 11 Apr 2007 17:54:21 -0000 1.9
@@ -607,8 +607,8 @@
// Pixels that have alpha > 0.5, but have color 0, should be tweaked slightly
// so they don't get knocked out when blitting.
{
- uint32 Key32 = 0;
- uint32* p = GetData();
+ uint32_t Key32 = 0;
+ uint32_t* p = GetData();
int pixels = GetHeight() * GetWidth();
for (int i = 0; i < pixels; i++, p++) {
if ((*p >> 24) >= 128) {
Index: libgeometry/kd_tree_packed.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_packed.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libgeometry/kd_tree_packed.cpp 10 Feb 2007 18:40:20 -0000 1.10
+++ libgeometry/kd_tree_packed.cpp 11 Apr 2007 17:54:21 -0000 1.11
@@ -124,7 +124,7 @@
struct kd_face
{
- uint16 m_vi[3]; // vert indices
+ uint16_t m_vi[3]; // vert indices
// void local_assert() { compiler_assert(sizeof(struct kd_face) == 6); }
};
@@ -132,14 +132,14 @@
struct kd_leaf
{
- uint8 m_flags; // low two bits == 0b11
- uint8 m_face_count;
+ uint8_t m_flags; // low two bits == 0b11
+ uint8_t m_face_count;
kd_face* get_face(int index)
{
assert(index >= 0 && index < m_face_count);
- return (kd_face*) (((uint8*) this) + sizeof(struct kd_leaf) +
sizeof(kd_face) * index);
+ return (kd_face*) (((uint8_t*) this) + sizeof(struct kd_leaf) +
sizeof(kd_face) * index);
}
// void local_assert() { compiler_assert(sizeof(struct kd_leaf) == 2); }
@@ -162,7 +162,7 @@
class kd_node
{
public:
- uint8 m_flags[4];
+ uint8_t m_flags[4];
// low two bits == axis, if axis == 3 then this is leaf.
// 0x04 is set if the neg child is present.
// 0x08 is set if the pos child is present
@@ -183,7 +183,7 @@
if (has_neg_child())
{
// Neg child follows immediately.
- return (kd_node*) (((uint8*) this) + sizeof(kd_node));
+ return (kd_node*) (((uint8_t*) this) + sizeof(kd_node));
}
else return NULL;
}
@@ -195,7 +195,7 @@
unsigned int offset = (m_flags[1]) + (m_flags[2] << 8)
+ (m_flags[3] << 16);
assert(offset >= sizeof(kd_node)); // sanity check
- return (kd_node*) (((uint8*) this) + offset);
+ return (kd_node*) (((uint8_t*) this) + offset);
}
else return NULL;
}
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- plugin/plugin.cpp 7 Mar 2007 19:06:12 -0000 1.73
+++ plugin/plugin.cpp 11 Apr 2007 17:54:21 -0000 1.74
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: plugin.cpp,v 1.73 2007/03/07 19:06:12 bjacques Exp $ */
+/* $Id: plugin.cpp,v 1.74 2007/04/11 17:54:21 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -437,7 +437,7 @@
}
/// \brief Return how many bytes we can read into the buffer
-int32
+int32_t
nsPluginInstance::WriteReady(NPStream * /* stream */ )
{
#if 0
@@ -449,8 +449,8 @@
/// \brief Read the data stream from Mozilla/Firefox
///
/// For now we read the bytes and write them to a disk file.
-int32
-nsPluginInstance::Write(NPStream * /* stream */, int32 /* offset */, int32 len,
+int32_t
+nsPluginInstance::Write(NPStream * /* stream */, int32_t /* offset */, int32_t
len,
void * buffer)
{
#if 0
Index: plugin/plugin.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- plugin/plugin.h 15 Dec 2006 21:25:59 -0000 1.29
+++ plugin/plugin.h 11 Apr 2007 17:54:21 -0000 1.30
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: plugin.h,v 1.29 2006/12/15 21:25:59 rsavoye Exp $ */
+/* $Id: plugin.h,v 1.30 2007/04/11 17:54:21 bjacques Exp $ */
#ifndef __PLUGIN_H__
#define __PLUGIN_H__
@@ -79,11 +79,11 @@
NPError SetWindow(NPWindow *aWindow);
NPError NewStream(NPMIMEType type, NPStream *stream, NPBool seekable,
- uint16 *stype);
+ uint16_t *stype);
NPError DestroyStream(NPStream * stream, NPError reason);
- int32 WriteReady(NPStream *stream);
- int32 Write(NPStream *stream, int32 offset, int32 len, void *buffer);
+ int32_t WriteReady(NPStream *stream);
+ int32_t Write(NPStream *stream, int32_t offset, int32_t len, void *buffer);
NPError WriteStatus(char *msg) const;
NPError WriteStatus(std::string msg) const;
Index: plugin/win32/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- plugin/win32/plugin.cpp 20 Nov 2006 16:40:22 -0000 1.5
+++ plugin/win32/plugin.cpp 11 Apr 2007 17:54:21 -0000 1.6
@@ -137,7 +137,7 @@
}
NPError nsPluginInstance::NewStream(NPMIMEType type, NPStream * stream,
- NPBool seekable, uint16 * stype)
+ NPBool seekable, uint16_t * stype)
{
// dbglogfile << "NewStream" << stream->url << endl;
return NPERR_NO_ERROR;
@@ -282,9 +282,9 @@
return;
}
- uint64 start_ticks = 0;
+ uint64_t start_ticks = 0;
start_ticks = tu_timer::get_ticks();
- uint64 last_ticks = start_ticks;
+ uint64_t last_ticks = start_ticks;
float scale = 1.0f;
bool background = true;
@@ -301,7 +301,7 @@
gnash::set_current_root(m);
gnash::delete_unused_root();
- uint64 ticks;
+ uint64_t ticks;
ticks = tu_timer::get_ticks();
int delta_ticks = tu_timer::get_ticks() - last_ticks;
float delta_t = delta_ticks / 1000.f;
Index: plugin/win32/plugin.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- plugin/win32/plugin.h 29 Oct 2006 18:34:17 -0000 1.3
+++ plugin/win32/plugin.h 11 Apr 2007 17:54:21 -0000 1.4
@@ -43,7 +43,7 @@
NPBool isInitialized();
NPError SetWindow(NPP instance, NPWindow* window);
NPError NewStream(NPMIMEType type, NPStream * stream,
- NPBool seekable, uint16 * stype);
+ NPBool seekable, uint16_t * stype);
NPError DestroyStream(NPStream * stream, NPError reason);
// locals
Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/as_value.h 2 Apr 2007 22:45:09 -0000 1.41
+++ server/as_value.h 11 Apr 2007 17:54:21 -0000 1.42
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: as_value.h,v 1.41 2007/04/02 22:45:09 nihilus Exp $ */
+/* $Id: as_value.h,v 1.42 2007/04/11 17:54:21 bjacques Exp $ */
#ifndef GNASH_AS_VALUE_H
#define GNASH_AS_VALUE_H
@@ -167,12 +167,12 @@
// continues to work.
#if (WCHAR_MAX != MAXINT)
- tu_string::encode_utf8_from_wchar(&m_string_value, (const
uint16 *)wstr);
+ tu_string::encode_utf8_from_wchar(&m_string_value, (const
uint16_t *)wstr);
#else
# if (WCHAR_MAX != MAXSHORT)
# error "Can't determine the size of wchar_t"
# else
- tu_string::encode_utf8_from_wchar(&m_string_value, (const
uint32 *)wstr);
+ tu_string::encode_utf8_from_wchar(&m_string_value, (const
uint32_t *)wstr);
# endif
#endif
}
Index: server/execute_tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/execute_tag.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/execute_tag.h 11 Apr 2007 14:20:20 -0000 1.10
+++ server/execute_tag.h 11 Apr 2007 17:54:21 -0000 1.11
@@ -25,7 +25,7 @@
#include "config.h"
#endif
-#include "tu_types.h" // for uint32 typedef
+#include "tu_types.h" // for uint32_t typedef
#include <cstdarg>
#include <cassert>
@@ -92,7 +92,7 @@
//
/// The default implementation returns 0
///
- virtual uint32 get_depth_id_of_replace_or_add_tag() const
+ virtual uint32_t get_depth_id_of_replace_or_add_tag() const
{
return 0;
}
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- server/sprite_instance.cpp 11 Apr 2007 14:20:20 -0000 1.232
+++ server/sprite_instance.cpp 11 Apr 2007 17:54:21 -0000 1.233
@@ -2410,7 +2410,7 @@
sprite_instance::find_previous_replace_or_add_tag(int frame,
int depth, int id)
{
- uint32 depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
+ uint32_t depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
for (int f = frame - 1; f >= 0; f--)
{
Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/swf_function.h 20 Mar 2007 15:01:20 -0000 1.11
+++ server/swf_function.h 11 Apr 2007 17:54:21 -0000 1.12
@@ -71,12 +71,12 @@
};
std::vector<arg_spec> m_args;
bool m_is_function2;
- uint8 m_local_register_count;
+ uint8_t m_local_register_count;
/// used by function2 to control implicit arg register assignments
//
/// See
http://sswf.sourceforge.net/SWFalexref.html#action_declare_function2
- uint16 m_function2_flags;
+ uint16_t m_function2_flags;
/// Return a pointer to the given object's superclass interface
//
@@ -205,9 +205,9 @@
void set_is_function2() { m_is_function2 = true; }
- void set_local_register_count(uint8 ct) { assert(m_is_function2);
m_local_register_count = ct; }
+ void set_local_register_count(uint8_t ct) { assert(m_is_function2);
m_local_register_count = ct; }
- void set_function2_flags(uint16 flags) { assert(m_is_function2);
m_function2_flags = flags; }
+ void set_function2_flags(uint16_t flags) { assert(m_is_function2);
m_function2_flags = flags; }
void add_arg(int arg_register, const char* name)
{
Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/textformat.cpp 8 Apr 2007 15:00:12 -0000 1.23
+++ server/textformat.cpp 11 Apr 2007 17:54:21 -0000 1.24
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: textformat.cpp,v 1.23 2007/04/08 15:00:12 nihilus Exp $
+// $Id: textformat.cpp,v 1.24 2007/04/11 17:54:21 bjacques Exp $
//
#include "log.h"
@@ -185,7 +185,7 @@
if (obj->get_member("color", &method)) {
//log_msg("Color exists and is set to %f\n", method.to_number());
- obj->obj.colorSet((uint32)method.to_number());
+ obj->obj.colorSet((uint32_t)method.to_number());
}
if (obj->get_member("indent", &method)) {
Index: server/textformat.h
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/textformat.h 8 Apr 2007 15:00:12 -0000 1.14
+++ server/textformat.h 11 Apr 2007 17:54:21 -0000 1.15
@@ -15,7 +15,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: textformat.h,v 1.14 2007/04/08 15:00:12 nihilus Exp $
+// $Id: textformat.h,v 1.15 2007/04/11 17:54:21 bjacques Exp $
//
#ifndef __TEXTFORMAT_H__
@@ -58,7 +58,7 @@
//
/// A number containing three 8-bit RGB components; for example,
/// 0xFF0000 is red, 0x00FF00 is green.
- uint32 color() const { return _color; }
+ uint32_t color() const { return _color; }
/// \brief
/// Return ann integer that indicates the indentation from the left
@@ -98,7 +98,7 @@
void italicedSet(bool x) { _italic = x; }
void boldSet(bool x) { _bold = x; }
void bulletSet(bool x) { _bullet = x; }
- void colorSet(uint32 x) { _color = x; }
+ void colorSet(uint32_t x) { _color = x; }
void indentSet(float x) { _indent = x; }
void alignSet(const std::string& x) { _align = x; }
@@ -151,7 +151,7 @@
//
/// A number containing three 8-bit RGB components; for example,
/// 0xFF0000 is red, 0x00FF00 is green.
- uint32 _color;
+ uint32_t _color;
// The name of a font for text as a string.
std::string _font;
Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/timers.cpp 5 Apr 2007 07:31:28 -0000 1.28
+++ server/timers.cpp 11 Apr 2007 17:54:21 -0000 1.29
@@ -18,7 +18,7 @@
//
//
-/* $Id: timers.cpp,v 1.28 2007/04/05 07:31:28 strk Exp $ */
+/* $Id: timers.cpp,v 1.29 2007/04/11 17:54:21 bjacques Exp $ */
#include "timers.h"
#include "as_function.h" // for class as_function
@@ -89,7 +89,7 @@
{
if (_start)
{
- uint64 now = tu_timer::get_profile_ticks();
+ uint64_t now = tu_timer::get_profile_ticks();
//log_msg("now: %lu", now);
assert(now > _start);
Index: server/timers.h
===================================================================
RCS file: /sources/gnash/gnash/server/timers.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/timers.h 5 Apr 2007 07:31:28 -0000 1.18
+++ server/timers.h 11 Apr 2007 17:54:21 -0000 1.19
@@ -143,10 +143,10 @@
void start();
/// Number of microseconds between expirations
- uint64 _interval;
+ uint64_t _interval;
/// Number of microseconds since epoch at Timer start
- uint64 _start;
+ uint64_t _start;
/// The associated function, stored in an intrusive pointer
boost::intrusive_ptr<as_function> _function;
Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/NetStreamFfmpeg.cpp 11 Apr 2007 13:03:45 -0000 1.36
+++ server/asobj/NetStreamFfmpeg.cpp 11 Apr 2007 17:54:21 -0000 1.37
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamFfmpeg.cpp,v 1.36 2007/04/11 13:03:45 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.37 2007/04/11 17:54:21 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -684,7 +684,7 @@
}
// audio callback is running in sound handler thread
-bool NetStreamFfmpeg::audio_streamer(void *owner, uint8 *stream, int len)
+bool NetStreamFfmpeg::audio_streamer(void *owner, uint8_t *stream, int len)
{
NetStreamFfmpeg* ns = static_cast<NetStreamFfmpeg*>(owner);
Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/NetStreamFfmpeg.h 10 Apr 2007 21:31:00 -0000 1.21
+++ server/asobj/NetStreamFfmpeg.h 11 Apr 2007 17:54:21 -0000 1.22
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamFfmpeg.h,v 1.21 2007/04/10 21:31:00 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -210,7 +210,7 @@
static void startPlayback(NetStreamFfmpeg* ns);
static void av_streamer(NetStreamFfmpeg* ns);
- static bool audio_streamer(void *udata, uint8 *stream, int len);
+ static bool audio_streamer(void *udata, uint8_t *stream, int len);
private:
Index: server/asobj/SoundFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/SoundFfmpeg.h 9 Mar 2007 14:38:29 -0000 1.2
+++ server/asobj/SoundFfmpeg.h 11 Apr 2007 17:54:21 -0000 1.3
@@ -58,7 +58,7 @@
static offset_t seekMedia(void *opaque, offset_t offset, int whence);
static void setupDecoder(SoundFfmpeg* so);
- static bool getAudio(void *owner, uint8 *stream, int len);
+ static bool getAudio(void *owner, uint8_t *stream, int len);
private:
// audio
Index: server/asobj/SoundGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/SoundGst.h 14 Feb 2007 20:41:48 -0000 1.1
+++ server/asobj/SoundGst.h 11 Apr 2007 17:54:21 -0000 1.2
@@ -54,7 +54,7 @@
static int seekMedia(void *opaque, int offset, int whence);
static void setupDecoder(SoundGst* so);
- static bool getAudio(void *owner, uint8 *stream, int len);
+ static bool getAudio(void *owner, uint8_t *stream, int len);
static void callback_newpad (GstElement *decodebin, GstPad *pad,
gboolean last, gpointer data);
private:
Index: server/asobj/SoundMad.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/SoundMad.h 14 Feb 2007 20:41:48 -0000 1.1
+++ server/asobj/SoundMad.h 11 Apr 2007 17:54:21 -0000 1.2
@@ -50,7 +50,7 @@
unsigned int getPosition();
static void setupDecoder(SoundMad* so);
- static bool getAudio(void *owner, uint8 *stream, int len);
+ static bool getAudio(void *owner, uint8_t *stream, int len);
private:
long inputPos;
Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/parser/action_buffer.cpp 28 Feb 2007 09:46:48 -0000 1.14
+++ server/parser/action_buffer.cpp 11 Apr 2007 17:54:21 -0000 1.15
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: action_buffer.cpp,v 1.14 2007/02/28 09:46:48 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.15 2007/04/11 17:54:21 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -114,7 +114,7 @@
// Actual processing.
size_t i = start_pc;
uint16_t length = uint16_t(read_int16(i+1));
- uint16 count = uint16_t(read_int16(i+3));
+ uint16_t count = uint16_t(read_int16(i+3));
i += 2;
//log_msg("Start at %d, stop at %d, length read was %d, count read was %d",
start_pc, stop_pc, length, count);
@@ -280,7 +280,7 @@
// wacky format: 45670123
union {
double d;
- uint64 i;
+ uint64_t i;
struct {
uint32_t lo;
uint32_t hi;
@@ -295,7 +295,7 @@
dbglogfile << "(double) " << u.d << endl;
} else if (type == 7) {
- // int32
+ // int32_t
int32_t val = instruction_data[3 + i]
| (instruction_data[3 + i + 1] << 8)
| (instruction_data[3 + i + 2] << 16)
@@ -352,7 +352,7 @@
<< " arg_count = " << arg_count
<< " reg_count = " << reg_count << endl;
- uint16 flags = (instruction_data[3 + i]) | (instruction_data[3
+ i + 1] << 8);
+ uint16_t flags = (instruction_data[3 + i]) | (instruction_data[3
+ i + 1] << 8);
i += 2;
// @@ What is the difference between "super" and "_parent"?
@@ -435,7 +435,7 @@
// wacky format: 45670123
union {
double d;
- uint64 i;
+ uint64_t i;
struct {
uint32_t lo;
uint32_t hi;
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/parser/movie_def_impl.h 10 Apr 2007 15:48:39 -0000 1.36
+++ server/parser/movie_def_impl.h 11 Apr 2007 17:54:22 -0000 1.37
@@ -263,7 +263,7 @@
int m_loading_sound_stream;
- uint32 m_file_length;
+ uint32_t m_file_length;
std::auto_ptr<jpeg::input> m_jpeg_in;
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/PlaceObject2Tag.cpp 11 Apr 2007 14:20:21 -0000 1.1
+++ server/swf/PlaceObject2Tag.cpp 11 Apr 2007 17:54:22 -0000 1.2
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: PlaceObject2Tag.cpp,v 1.1 2007/04/11 14:20:21 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -104,7 +104,7 @@
break;
}
- uint8 ch = key::INVALID;
+ uint8_t ch = key::INVALID;
if (flags & (1 << 17)) // has keypress event
{
@@ -385,10 +385,10 @@
}
}
-uint32
+uint32_t
PlaceObject2Tag::get_depth_id_of_replace_or_add_tag() const
{
- uint32 depthid = 0;
+ uint32_t depthid = 0;
if (m_place_type == PLACE || m_place_type == REPLACE)
{
int id = -1;
Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/PlaceObject2Tag.h 11 Apr 2007 14:20:21 -0000 1.1
+++ server/swf/PlaceObject2Tag.h 11 Apr 2007 17:54:22 -0000 1.2
@@ -18,7 +18,7 @@
//
//
-/* $Id: PlaceObject2Tag.h,v 1.1 2007/04/11 14:20:21 strk Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
#ifndef GNASH_SWF_PLACEOBJECT2TAG_H
#define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -31,7 +31,7 @@
#include "swf.h" // for tag_type definition
#include "matrix.h" // for composition
#include "cxform.h" // for composition
-#include "tu_types.h" // for uint16_t, uint32 etc. definition
+#include "tu_types.h" // for uint16_t, uint32_t etc. definition
//#include <boost/ptr_container/ptr_vector.hpp>
#include <vector>
@@ -122,7 +122,7 @@
void execute_state_reverse(sprite_instance* m, int frame);
- uint32 get_depth_id_of_replace_or_add_tag() const;
+ uint32_t get_depth_id_of_replace_or_add_tag() const;
};
} // namespace gnash::SWF::tag_loaders
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/vm/ASHandlers.cpp 10 Apr 2007 21:44:14 -0000 1.86
+++ server/vm/ASHandlers.cpp 11 Apr 2007 17:54:22 -0000 1.87
@@ -14,7 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: ASHandlers.cpp,v 1.86 2007/04/10 21:44:14 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.87 2007/04/11 17:54:22 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -634,7 +634,7 @@
// skip the specified number of actions.
//
unsigned int framenum = code.read_int16(thread.pc+3);
- uint8 skip = code[thread.pc+5];
+ uint8_t skip = code[thread.pc+5];
character* target = env.get_target();
sprite_instance* target_sprite = target->to_movie();
@@ -1464,7 +1464,7 @@
thread.ensureStack(1); // expression
// how many actions to skip if frame has not been loaded
- uint8 skip = code[thread.pc+3];
+ uint8_t skip = code[thread.pc+3];
// env.top(0) contains frame specification,
// evaluated as for ActionGotoExpression
@@ -1534,7 +1534,7 @@
"register", // 4
"bool", // 5
"double", // 6
- "int32", // 7
+ "int32_t", // 7
"dict8", // 8
"dict16" // 9
};
@@ -3203,7 +3203,7 @@
//cerr << " nargs:" << nargs << endl;
// Get the count of local registers used by this function.
- uint8 register_count = code[i];
+ uint8_t register_count = code[i];
i++;
//cerr << " nregisters:" << nargs << endl;
@@ -3211,7 +3211,7 @@
func->set_local_register_count(register_count);
// Flags, for controlling register assignment of implicit args.
- uint16 flags = code.read_int16(i);
+ uint16_t flags = code.read_int16(i);
i += 2;
func->set_function2_flags(flags);
@@ -3219,7 +3219,7 @@
// Get the register assignments and names of the arguments.
for (unsigned n = 0; n < nargs; n++)
{
- uint8 arg_register = code[i];
+ uint8_t arg_register = code[i];
++i;
// @@ security: watch out for possible missing terminator here!