[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash backend/render_handler_agg.cpp backend/re...
|
From: |
Zou Lunkai |
|
Subject: |
[Gnash-commit] gnash backend/render_handler_agg.cpp backend/re... |
|
Date: |
Wed, 12 Dec 2007 10:07:02 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Zou Lunkai <zoulunkai> 07/12/12 10:07:01
Modified files:
backend : render_handler_agg.cpp
render_handler_agg_bitmap.h
render_handler_agg_style.h
render_handler_cairo.cpp render_handler_d3d.cpp
render_handler_ogl.cpp render_handler_ogl.h
render_handler_xbox.cpp
libamf : amf.cpp
libbase : BitsReader.h FLVParser.cpp FLVParser.h
LoadThread.cpp LoadThread.h image.cpp image.h
image_filters.cpp tu_file.cpp tu_file.h
libmedia : AudioDecoder.h AudioDecoderNellymoser.cpp
AudioDecoderNellymoser.h AudioDecoderSimple.cpp
AudioDecoderSimple.h FLVParser.cpp FLVParser.h
MediaBuffer.h MediaDecoder.cpp MediaParser.h
VideoDecoder.h sound_handler.h
server : BevelFilter.h BlurFilter.h ConvolutionFilter.h
DropShadowFilter.h FreetypeGlyphsProvider.cpp
GlowFilter.h GradientBevelFilter.h
GradientGlowFilter.h array.cpp as_environment.h
as_value.cpp cxform.cpp fill_style.cpp
fill_style.h font.cpp movie_root.cpp
sprite_instance.cpp stream.cpp stream.h
styles.cpp swf_function.cpp swf_function.h
types.cpp types.h
testsuite : FuzzyPixel.h
Log message:
remaining uint8_t-->boost::uint8_t. Don't mix use global typedefs(if
any) with boost typedefs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.122&r2=1.123
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_bitmap.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_style.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_cairo.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_d3d.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_xbox.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/BitsReader.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image_filters.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoder.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderNellymoser.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoderSimple.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/FLVParser.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaBuffer.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaDecoder.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/MediaParser.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/VideoDecoder.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sound_handler.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BevelFilter.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BlurFilter.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ConvolutionFilter.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DropShadowFilter.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/FreetypeGlyphsProvider.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GlowFilter.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientBevelFilter.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/GradientGlowFilter.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.410&r2=1.411
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/styles.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/FuzzyPixel.h?cvsroot=gnash&r1=1.6&r2=1.7
Patches:
Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- backend/render_handler_agg.cpp 4 Dec 2007 11:45:21 -0000 1.122
+++ backend/render_handler_agg.cpp 12 Dec 2007 10:06:58 -0000 1.123
@@ -17,7 +17,7 @@
-/* $Id: render_handler_agg.cpp,v 1.122 2007/12/04 11:45:21 strk Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.123 2007/12/12 10:06:58 zoulunkai Exp $ */
// Original version by Udo Giacomozzi and Hannes Mayr,
// INDUNET GmbH (www.indunet.it)
@@ -273,7 +273,7 @@
// * = m_rbuf is first initialized with a NULL buffer so that m_pixf and
// m_rbase initialize with the correct buffer extents
- m_buffer = new uint8_t[width*height];
+ m_buffer = new boost::uint8_t[width*height];
m_rbuf.attach(m_buffer, width, height, width);
@@ -320,7 +320,7 @@
private:
// in-memory buffer
- uint8_t* m_buffer;
+ boost::uint8_t* m_buffer;
// agg class to access the buffer
agg::rendering_buffer m_rbuf;
@@ -2093,8 +2093,8 @@
union {
boost::uint16_t word;
struct {
- uint8_t b1;
- uint8_t b2;
+ boost::uint8_t b1;
+ boost::uint8_t b2;
};
} u;
Index: backend/render_handler_agg_bitmap.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_bitmap.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- backend/render_handler_agg_bitmap.h 1 Jul 2007 10:53:47 -0000 1.6
+++ backend/render_handler_agg_bitmap.h 12 Dec 2007 10:06:58 -0000 1.7
@@ -36,10 +36,10 @@
int get_height() const { return m_height; }
int get_bpp() const { return m_bpp; }
int get_rowlen() const { return m_rowlen; }
- uint8_t* get_data() const { return m_data; }
+ boost::uint8_t* get_data() const { return m_data; }
protected:
- uint8_t* m_data;
+ boost::uint8_t* m_data;
int m_width;
int m_height;
int m_bpp;
@@ -56,7 +56,7 @@
{
public:
- agg_bitmap_info(int width, int height, int rowlen, uint8_t* data, int bpp)
+ agg_bitmap_info(int width, int height, int rowlen, boost::uint8_t* data, int
bpp)
{
//printf("creating bitmap %dx%d pixels with %d bytes rowsize\n",
width,height,rowlen);
@@ -65,7 +65,7 @@
m_height = height;
m_rowlen = rowlen;
- m_data = new uint8_t[height*rowlen];
+ m_data = new boost::uint8_t[height*rowlen];
memcpy(m_data, data, height*rowlen);
}
Index: backend/render_handler_agg_style.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_style.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- backend/render_handler_agg_style.h 30 Oct 2007 18:55:40 -0000 1.27
+++ backend/render_handler_agg_style.h 12 Dec 2007 10:06:58 -0000 1.28
@@ -116,7 +116,7 @@
bool m_force_premultiply;
- agg_style_bitmap(int width, int height, int rowlen, uint8_t* data,
+ agg_style_bitmap(int width, int height, int rowlen, boost::uint8_t* data,
gnash::matrix mat, gnash::cxform cx) :
m_force_premultiply(false),
Index: backend/render_handler_cairo.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_cairo.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- backend/render_handler_cairo.cpp 4 Dec 2007 11:45:22 -0000 1.36
+++ backend/render_handler_cairo.cpp 12 Dec 2007 10:06:58 -0000 1.37
@@ -50,12 +50,12 @@
// Converts from RGB image to 32-bit pixels in CAIRO_FORMAT_RGB24 format
static void
-rgb_to_cairo_rgb24(uint8_t* dst, const image::rgb* im)
+rgb_to_cairo_rgb24(boost::uint8_t* dst, const image::rgb* im)
{
boost::uint32_t* dst32 = reinterpret_cast<boost::uint32_t*>(dst);
for (size_t y = 0; y < im->height(); y++)
{
- const uint8_t* src = im->scanline(y);
+ const boost::uint8_t* src = im->scanline(y);
for (size_t x = 0; x < im->width(); x++, src += 3)
{
*dst32++ = (src[0] << 16) | (src[1] << 8) | src[2];
@@ -65,15 +65,15 @@
// Converts from RGBA image to 32-bit pixels in CAIRO_FORMAT_ARGB32 format
static void
-rgba_to_cairo_argb(uint8_t* dst, const image::rgba* im)
+rgba_to_cairo_argb(boost::uint8_t* dst, const image::rgba* im)
{
boost::uint32_t* dst32 = reinterpret_cast<boost::uint32_t*>(dst);
for (size_t y = 0; y < im->height(); y++)
{
- const uint8_t* src = im->scanline(y);
+ const boost::uint8_t* src = im->scanline(y);
for (size_t x = 0; x < im->width(); x++, src += 4)
{
- const uint8_t& r = src[0],
+ const boost::uint8_t& r = src[0],
g = src[1],
b = src[2],
a = src[3];
@@ -92,7 +92,7 @@
class bitmap_info_cairo : public bitmap_info
{
public:
- bitmap_info_cairo(uint8_t* data, int width, int height,
+ bitmap_info_cairo(boost::uint8_t* data, int width, int height,
size_t bpp, cairo_format_t format)
: _data(data),
_width(width),
@@ -135,7 +135,7 @@
}
private:
- boost::scoped_array<uint8_t> _data;
+ boost::scoped_array<boost::uint8_t> _data;
int _width;
int _height;
size_t _bytes_per_pixel;
@@ -204,7 +204,7 @@
virtual bitmap_info* create_bitmap_info_rgb(image::rgb* im)
{
int buf_size = im->width() * im->height() * 4;
- uint8_t* buffer = new uint8_t[buf_size];
+ boost::uint8_t* buffer = new boost::uint8_t[buf_size];
rgb_to_cairo_rgb24(buffer, im);
@@ -215,7 +215,7 @@
virtual bitmap_info* create_bitmap_info_rgba(image::rgba* im)
{
int buf_size = im->width() * im->height() * 4;
- uint8_t* buffer = new uint8_t[buf_size];
+ boost::uint8_t* buffer = new boost::uint8_t[buf_size];
rgba_to_cairo_argb(buffer, im);
@@ -263,7 +263,7 @@
size_t buf_size = w * h * 4;
if (_video_bufsize < buf_size) {
- _video_buffer.reset(new uint8_t[buf_size]);
+ _video_buffer.reset(new boost::uint8_t[buf_size]);
_video_bufsize = buf_size;
}
@@ -961,7 +961,7 @@
private:
/// The cairo context.
cairo_t* _cr;
- boost::scoped_array<uint8_t> _video_buffer;
+ boost::scoped_array<boost::uint8_t> _video_buffer;
std::vector<PathVec> _masks;
size_t _video_bufsize;
bool _drawing_mask;
Index: backend/render_handler_d3d.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_d3d.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- backend/render_handler_d3d.cpp 4 Dec 2007 11:45:22 -0000 1.13
+++ backend/render_handler_d3d.cpp 12 Dec 2007 10:06:58 -0000 1.14
@@ -97,7 +97,7 @@
void convert_to_argb(image::rgba* im);
bitmap_info_d3d(image::rgb* im);
bitmap_info_d3d(image::rgba* im);
- bitmap_info_d3d(int width, int height, uint8_t* data);
+ bitmap_info_d3d(int width, int height, boost::uint8_t* data);
};
@@ -126,7 +126,7 @@
// not supported
}
- static void make_next_miplevel(int* width, int* height, uint8_t* data)
+ static void make_next_miplevel(int* width, int* height, boost::uint8_t* data)
// Utility. Mutates *width, *height and *data to create the
// next mip level.
{
@@ -152,12 +152,12 @@
{
// Resample. Simple average 2x2 --> 1, in-place.
for (int j = 0; j < new_h; j++) {
- uint8_t* out = ((uint8_t*) data) + j * new_w;
- uint8_t* in = ((uint8_t*) data) + (j << 1) * *width;
+ boost::uint8_t* out = ((boost::uint8_t*) data) + j * new_w;
+ boost::uint8_t* in = ((boost::uint8_t*) data) + (j << 1) * *width;
for (int i = 0; i < new_w; i++) {
int a;
a = (*(in + 0) + *(in + 1) + *(in + 0 + *width) + *(in + 1 +
*width));
- *(out) = (uint8_t) (a >> 2);
+ *(out) = (boost::uint8_t) (a >> 2);
out++;
in += 2;
}
@@ -303,10 +303,10 @@
// Additive color.
apply_color(gameswf::rgba(
- uint8_t(m_bitmap_color_transform.m_[0][1]),
- uint8_t(m_bitmap_color_transform.m_[1][1]),
- uint8_t(m_bitmap_color_transform.m_[2][1]),
- uint8_t(m_bitmap_color_transform.m_[3][1])));
+ boost::uint8_t(m_bitmap_color_transform.m_[0][1]),
+ boost::uint8_t(m_bitmap_color_transform.m_[1][1]),
+ boost::uint8_t(m_bitmap_color_transform.m_[2][1]),
+ boost::uint8_t(m_bitmap_color_transform.m_[3][1])));
m_pd3dDevice->SetTextureStageState(0, D3DTSS_COLOROP, D3DTOP_SELECTARG2);
m_pd3dDevice->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG2);
@@ -345,10 +345,10 @@
m_bitmap_color_transform.m_[3][1] = clamp(color_transform.m_[3][1],
-255.0f, 255.0f);
m_color = gameswf::rgba(
- uint8_t(m_bitmap_color_transform.m_[0][0]*255.0f),
- uint8_t(m_bitmap_color_transform.m_[1][0]*255.0f),
- uint8_t(m_bitmap_color_transform.m_[2][0]*255.0f),
- uint8_t(m_bitmap_color_transform.m_[3][0]*255.0f));
+ boost::uint8_t(m_bitmap_color_transform.m_[0][0]*255.0f),
+ boost::uint8_t(m_bitmap_color_transform.m_[1][0]*255.0f),
+ boost::uint8_t(m_bitmap_color_transform.m_[2][0]*255.0f),
+ boost::uint8_t(m_bitmap_color_transform.m_[3][0]*255.0f));
if (m_bitmap_color_transform.m_[0][1] > 1.0f
|| m_bitmap_color_transform.m_[1][1] > 1.0f
@@ -497,7 +497,7 @@
return new bitmap_info_d3d(im);
}
- void set_alpha_image(gameswf::bitmap_info* bi, int w, int h, uint8_t* data)
+ void set_alpha_image(gameswf::bitmap_info* bi, int w, int h,
boost::uint8_t* data)
// Set the specified bitmap_info so that it contains an alpha
// texture with the given data (1 byte per texel).
//
@@ -1053,11 +1053,11 @@
// Need to insert a dummy alpha byte in the image data, for
// D3DXLoadSurfaceFromMemory.
// @@ this sucks :(
- uint8_t* expanded_data = new uint8_t[m_original_width * m_original_height *
4];
- uint8_t* pdata = expanded_data;
+ boost::uint8_t* expanded_data = new boost::uint8_t[m_original_width *
m_original_height * 4];
+ boost::uint8_t* pdata = expanded_data;
for (int y = 0; y < m_original_height; y++)
{
- uint8_t* scanline = image::scanline(im, y);
+ boost::uint8_t* scanline = image::scanline(im, y);
for (int x = 0; x < m_original_width; x++)
{
*pdata++ = scanline[x * 3 + 2]; // blue
@@ -1117,10 +1117,10 @@
typedef struct
{
- uint8_t r;
- uint8_t g;
- uint8_t b;
- uint8_t a;
+ boost::uint8_t r;
+ boost::uint8_t g;
+ boost::uint8_t b;
+ boost::uint8_t a;
} RGBA;
void bitmap_info_d3d::convert_to_argb(image::rgba* im)
@@ -1209,7 +1209,7 @@
}
-bitmap_info_d3d::bitmap_info_d3d(int width, int height, uint8_t* data)
+bitmap_info_d3d::bitmap_info_d3d(int width, int height, boost::uint8_t* data)
// Initialize this bitmap_info to an alpha image
// containing the specified data (1 byte per texel).
//
Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- backend/render_handler_ogl.cpp 10 Dec 2007 00:07:23 -0000 1.102
+++ backend/render_handler_ogl.cpp 12 Dec 2007 10:06:58 -0000 1.103
@@ -116,7 +116,7 @@
OSRenderMesa(size_t width, size_t height)
: _width(width),
_height(height),
- _buffer(new uint8_t[width * height * 3]),
+ _buffer(new boost::uint8_t[width * height * 3]),
#if OSMESA_MAJOR_VERSION * 100 + OSMESA_MINOR_VERSION >= 305
_context(OSMesaCreateContextExt(OSMESA_RGB, 0, 2, 0, NULL))
#else
@@ -171,7 +171,7 @@
private:
size_t _width;
size_t _height;
- boost::scoped_array<uint8_t> _buffer;
+ boost::scoped_array<boost::uint8_t> _buffer;
OSMesaContext _context;
};
@@ -445,7 +445,7 @@
while (h < _img->height()) { h <<= 1; }
}
- boost::scoped_array<uint8_t> resized_data(new
uint8_t[w*h*_img->pixelSize()]);
+ boost::scoped_array<boost::uint8_t> resized_data(new
boost::uint8_t[w*h*_img->pixelSize()]);
// Q: Would mipmapping these textures aid in performance?
GLint rv = gluScaleImage(_pixel_format, _img->width(),
@@ -466,7 +466,7 @@
}
void
-bitmap_info_ogl::upload(uint8_t* data, size_t width, size_t height)
+bitmap_info_ogl::upload(boost::uint8_t* data, size_t width, size_t height)
{
glTexParameteri(_ogl_img_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
Index: backend/render_handler_ogl.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- backend/render_handler_ogl.h 24 Nov 2007 00:27:03 -0000 1.5
+++ backend/render_handler_ogl.h 12 Dec 2007 10:06:58 -0000 1.6
@@ -151,7 +151,7 @@
private:
inline bool ogl_accessible() const;
void setup();
- void upload(uint8_t* data, size_t width, size_t height);
+ void upload(boost::uint8_t* data, size_t width, size_t height);
std::auto_ptr<image::image_base> _img;
GLenum _pixel_format;
Index: backend/render_handler_xbox.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_xbox.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- backend/render_handler_xbox.cpp 4 Dec 2007 11:45:22 -0000 1.10
+++ backend/render_handler_xbox.cpp 12 Dec 2007 10:06:58 -0000 1.11
@@ -89,7 +89,7 @@
bitmap_info_xbox(create_empty e);
bitmap_info_xbox(image::rgb* im);
bitmap_info_xbox(image::rgba* im);
- virtual void set_alpha_image(int width, int height, uint8_t* data);
+ virtual void set_alpha_image(int width, int height, boost::uint8_t*
data);
};
@@ -107,7 +107,7 @@
// not supported
}
- static void make_next_miplevel(int* width, int* height, uint8_t* data)
+ static void make_next_miplevel(int* width, int* height, boost::uint8_t*
data)
// Utility. Mutates *width, *height and *data to create the
// next mip level.
{
@@ -133,12 +133,12 @@
{
// Resample. Simple average 2x2 --> 1, in-place.
for (int j = 0; j < new_h; j++) {
- uint8_t* out = ((uint8_t*) data) + j *
new_w;
- uint8_t* in = ((uint8_t*) data) + (j <<
1) * *width;
+ boost::uint8_t* out = ((boost::uint8_t*) data)
+ j * new_w;
+ boost::uint8_t* in = ((boost::uint8_t*) data) +
(j << 1) * *width;
for (int i = 0; i < new_w; i++) {
int a;
a = (*(in + 0) + *(in + 1) + *(in + 0 +
*width) + *(in + 1 + *width));
- *(out) = (uint8_t) (a >> 2);
+ *(out) = (boost::uint8_t) (a >> 2);
out++;
in += 2;
}
@@ -400,7 +400,7 @@
}
- void set_alpha_image(gnash::bitmap_info* bi, int w, int h, uint8_t*
data)
+ void set_alpha_image(gnash::bitmap_info* bi, int w, int h,
boost::uint8_t* data)
// Set the specified bitmap_info so that it contains an alpha
// texture with the given data (1 byte per texel).
//
@@ -840,10 +840,10 @@
// D3DXLoadSurfaceFromMemory.
// @@ this sucks :(
int pixel_count = w * h;
- uint8_t* expanded_data = new uint8_t[pixel_count * 4];
+ boost::uint8_t* expanded_data = new boost::uint8_t[pixel_count * 4];
for (int y = 0; y < h; y++)
{
- uint8_t* scanline = image::scanline(rescaled, y);
+ boost::uint8_t* scanline = image::scanline(rescaled, y);
for (int x = 0; x < w; x++)
{
expanded_data[((y * w) + x) * 4 + 0] = scanline[x * 3 +
0]; // red
@@ -1070,7 +1070,7 @@
}
-void bitmap_info_xbox::set_alpha_image(int width, int height, uint8_t* data)
+void bitmap_info_xbox::set_alpha_image(int width, int height, boost::uint8_t*
data)
// Initialize this bitmap_info to an alpha image
// containing the specified data (1 byte per texel).
//
Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- libamf/amf.cpp 4 Dec 2007 11:45:23 -0000 1.42
+++ libamf/amf.cpp 12 Dec 2007 10:06:58 -0000 1.43
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: amf.cpp,v 1.42 2007/12/04 11:45:23 strk Exp $ */
+/* $Id: amf.cpp,v 1.43 2007/12/12 10:06:58 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -122,8 +122,8 @@
union {
boost::uint16_t s;
struct {
- uint8_t c0;
- uint8_t c1;
+ boost::uint8_t c0;
+ boost::uint8_t c1;
} c;
} u;
Index: libbase/BitsReader.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/BitsReader.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/BitsReader.h 4 Dec 2007 11:45:23 -0000 1.7
+++ libbase/BitsReader.h 12 Dec 2007 10:06:59 -0000 1.8
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: BitsReader.h,v 1.7 2007/12/04 11:45:23 strk Exp $
+// $Id: BitsReader.h,v 1.8 2007/12/12 10:06:59 zoulunkai Exp $
#ifndef BITSREADER_H
#define BITSREADER_H
@@ -91,7 +91,7 @@
boost::int32_t read_sint(unsigned short bitcount);
/// Read a byte as an unsigned int (aligned)
- uint8_t read_u8()
+ boost::uint8_t read_u8()
{
align();
return *ptr++;
Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/FLVParser.cpp 4 Dec 2007 11:45:23 -0000 1.24
+++ libbase/FLVParser.cpp 12 Dec 2007 10:06:59 -0000 1.25
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.cpp,v 1.24 2007/12/04 11:45:23 strk Exp $
+// $Id: FLVParser.cpp,v 1.25 2007/12/12 10:06:59 zoulunkai Exp $
#include "FLVParser.h"
#include "amf.h"
@@ -164,7 +164,7 @@
frame->timestamp = _audioFrames[_nextAudioFrame]->timestamp;
_lt.seek(_audioFrames[_nextAudioFrame]->dataPosition);
- frame->data = new uint8_t[frame->dataSize + PADDING_BYTES];
+ frame->data = new boost::uint8_t[frame->dataSize +
PADDING_BYTES];
size_t bytesread = _lt.read(frame->data, frame->dataSize);
memset(frame->data + bytesread, 0, PADDING_BYTES);
@@ -178,7 +178,7 @@
frame->timestamp = _videoFrames[_nextVideoFrame]->timestamp;
_lt.seek(_videoFrames[_nextVideoFrame]->dataPosition);
- frame->data = new uint8_t[frame->dataSize + PADDING_BYTES];
+ frame->data = new boost::uint8_t[frame->dataSize +
PADDING_BYTES];
size_t bytesread = _lt.read(frame->data, frame->dataSize);
memset(frame->data + bytesread, 0, PADDING_BYTES);
@@ -211,7 +211,7 @@
frame->tag = 8;
_lt.seek(_audioFrames[_nextAudioFrame]->dataPosition);
- frame->data = new uint8_t[_audioFrames[_nextAudioFrame]->dataSize +
+ frame->data = new
boost::uint8_t[_audioFrames[_nextAudioFrame]->dataSize +
PADDING_BYTES];
size_t bytesread = _lt.read(frame->data,
_audioFrames[_nextAudioFrame]->dataSize);
@@ -253,7 +253,7 @@
frame->tag = 9;
_lt.seek(_videoFrames[_nextVideoFrame]->dataPosition);
- frame->data = new uint8_t[_videoFrames[_nextVideoFrame]->dataSize +
+ frame->data = new
boost::uint8_t[_videoFrames[_nextVideoFrame]->dataSize +
PADDING_BYTES];
size_t bytesread = _lt.read(frame->data,
_videoFrames[_nextVideoFrame]->dataSize);
@@ -520,7 +520,7 @@
_lt.seek(_lastParsedPosition+4);
// Read the tag info
- uint8_t tag[12];
+ boost::uint8_t tag[12];
_lt.read(tag, 12);
// Extract length and timestamp
@@ -578,7 +578,7 @@
// Extract the video size from the videodata header
if (codec == VIDEO_CODEC_H263) {
_lt.seek(frame->dataPosition);
- uint8_t videohead[12];
+ boost::uint8_t videohead[12];
_lt.read(videohead, 12);
bool sizebit1 = (videohead[3] & 0x02);
@@ -643,7 +643,7 @@
_lt.seek(0);
// Read the header
- uint8_t header[9];
+ boost::uint8_t header[9];
_lt.read(header, 9);
// Check if this is really a FLV file
@@ -667,7 +667,7 @@
return true;
}
-inline boost::uint32_t FLVParser::getUInt24(uint8_t* in)
+inline boost::uint32_t FLVParser::getUInt24(boost::uint8_t* in)
{
// The bits are in big endian order
return (in[0] << 16) | (in[1] << 8) | in[2];
Index: libbase/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libbase/FLVParser.h 4 Dec 2007 11:45:23 -0000 1.20
+++ libbase/FLVParser.h 12 Dec 2007 10:06:59 -0000 1.21
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.h,v 1.20 2007/12/04 11:45:23 strk Exp $
+// $Id: FLVParser.h,v 1.21 2007/12/12 10:06:59 zoulunkai Exp $
// Information about the FLV format can be found at http://osflash.org/flv
@@ -39,9 +39,9 @@
{
public:
boost::uint32_t dataSize;
- uint8_t* data;
+ boost::uint8_t* data;
boost::uint64_t timestamp;
- uint8_t tag;
+ boost::uint8_t tag;
};
/// \brief
@@ -306,7 +306,7 @@
bool parseHeader();
// Functions used to extract numbers from the file
- inline boost::uint32_t getUInt24(uint8_t* in);
+ inline boost::uint32_t getUInt24(boost::uint8_t* in);
/// The interface to the file, externally owned
LoadThread& _lt;
Index: libbase/LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/LoadThread.cpp 20 Oct 2007 09:33:28 -0000 1.16
+++ libbase/LoadThread.cpp 12 Dec 2007 10:06:59 -0000 1.17
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: LoadThread.cpp,v 1.16 2007/10/20 09:33:28 strk Exp $
+// $Id: LoadThread.cpp,v 1.17 2007/12/12 10:06:59 zoulunkai Exp $
#include "LoadThread.h"
@@ -194,7 +194,7 @@
// check if the cache is big enough to contain the wanted data
if (static_cast<long>(bytes) > _cacheSize-20000) {
_cacheSize = bytes+20000;
- _cache.reset( new uint8_t[_cacheSize] );
+ _cache.reset( new boost::uint8_t[_cacheSize] );
}
// To avoid recaching all the time, we cache some data from before
@@ -277,7 +277,7 @@
boost::mutex::scoped_lock lock(_mutex);
#endif
- _cache.reset( new uint8_t[1024*500] );
+ _cache.reset( new boost::uint8_t[1024*500] );
_cacheSize = 1024*500;
int ret = _stream->read_bytes(_cache.get(), 1024);
Index: libbase/LoadThread.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/LoadThread.h 4 Dec 2007 11:45:23 -0000 1.15
+++ libbase/LoadThread.h 12 Dec 2007 10:06:59 -0000 1.16
@@ -138,7 +138,7 @@
bool _cancelRequested;
// Cache...
- boost::scoped_array<uint8_t> _cache;
+ boost::scoped_array<boost::uint8_t> _cache;
// The fileposition where the cache start
volatile long _cacheStart;
Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libbase/image.cpp 1 Dec 2007 00:14:58 -0000 1.25
+++ libbase/image.cpp 12 Dec 2007 10:06:59 -0000 1.26
@@ -21,7 +21,7 @@
//
/// Create an image taking ownership of the given buffer, supposedly of
height*pitch bytes
- image_base::image_base(uint8_t* data, int width, int height, int pitch,
id_image type)
+ image_base::image_base(boost::uint8_t* data, int width, int height, int
pitch, id_image type)
:
m_type(type),
m_size(height*pitch),
@@ -37,7 +37,7 @@
:
m_type(type),
m_size(height*pitch),
- m_data(new uint8_t[m_size]),
+ m_data(new boost::uint8_t[m_size]),
m_width(width),
m_height(height),
m_pitch(pitch)
@@ -45,7 +45,7 @@
assert(pitch >= width);
}
- void image_base::update(uint8_t* data)
+ void image_base::update(boost::uint8_t* data)
{
memcpy(m_data.get(), data, m_size);
}
@@ -58,7 +58,7 @@
memcpy(m_data.get(), from.m_data.get(), m_size);
}
- uint8_t* image_base::scanline(size_t y)
+ boost::uint8_t* image_base::scanline(size_t y)
{
assert(y < m_height);
return m_data.get() + m_pitch * y;
@@ -126,8 +126,8 @@
// Resample. Simple average 2x2 --> 1, in-place.
size_t pitch = m_pitch;
for (size_t j = 0; j < new_h; j++) {
- uint8_t* out = m_data.get() + j * new_pitch;
- uint8_t* in = m_data.get() + (j << 1) * pitch;
+ boost::uint8_t* out = m_data.get() + j * new_pitch;
+ boost::uint8_t* in = m_data.get() + (j << 1) * pitch;
for (size_t i = 0; i < new_w; i++) {
int r, g, b;
r = (*(in + 0) + *(in + 3) + *(in + 0 + pitch)
+ *(in + 3 + pitch));
@@ -184,13 +184,13 @@
}
- void rgba::set_pixel(size_t x, size_t y, uint8_t r, uint8_t g,
uint8_t b, uint8_t a)
+ void rgba::set_pixel(size_t x, size_t y, boost::uint8_t r,
boost::uint8_t g, boost::uint8_t b, boost::uint8_t a)
// Set the pixel at the given position.
{
assert(x < m_width);
assert(y < m_height);
- uint8_t* data = scanline(y) + 4 * x;
+ boost::uint8_t* data = scanline(y) + 4 * x;
data[0] = r;
data[1] = g;
@@ -199,12 +199,12 @@
}
// Set alpha value for given pixel
- void rgba::set_alpha(size_t x, size_t y, uint8_t a)
+ void rgba::set_alpha(size_t x, size_t y, boost::uint8_t a)
{
assert(x < m_width);
assert(y < m_height);
- uint8_t* data = scanline(y) + 4 * x;
+ boost::uint8_t* data = scanline(y) + 4 * x;
data[3] = a;
}
@@ -235,8 +235,8 @@
// Resample. Simple average 2x2 --> 1, in-place.
size_t pitch = m_pitch;
for (size_t j = 0; j < new_h; j++) {
- uint8_t* out = ((uint8_t*) m_data.get()) + j *
new_pitch;
- uint8_t* in = ((uint8_t*) m_data.get()) + (j <<
1) * pitch;
+ boost::uint8_t* out = ((boost::uint8_t*) m_data.get())
+ j * new_pitch;
+ boost::uint8_t* in = ((boost::uint8_t*) m_data.get()) +
(j << 1) * pitch;
for (size_t i = 0; i < new_w; i++) {
int r, g, b, a;
r = (*(in + 0) + *(in + 4) + *(in + 0 + pitch)
+ *(in + 4 + pitch));
@@ -282,7 +282,7 @@
assert(width > 0);
assert(height > 0);
- //m_data = new uint8_t[m_pitch * m_height];
+ //m_data = new boost::uint8_t[m_pitch * m_height];
}
@@ -314,8 +314,8 @@
// Resample. Simple average 2x2 --> 1, in-place.
for (size_t j = 0; j < new_h; j++)
{
- uint8_t* out = m_data.get() + j * new_w;
- uint8_t* in = m_data.get() + (j << 1) * m_width;
+ boost::uint8_t* out = m_data.get() + j * new_w;
+ boost::uint8_t* in = m_data.get() + (j << 1) * m_width;
for (size_t i = 0; i < new_w; i++)
{
int a;
@@ -337,13 +337,13 @@
}
- void alpha::set_pixel(size_t x, size_t y, uint8_t a)
+ void alpha::set_pixel(size_t x, size_t y, boost::uint8_t a)
// Set the pixel at the given position.
{
assert(x < m_width);
assert(y < m_height);
- uint8_t* data = scanline(y) + x;
+ boost::uint8_t* data = scanline(y) + x;
data[0] = a;
}
@@ -432,7 +432,7 @@
planes[i].coords[3][1] = th;
}
- m_data.reset( new uint8_t[m_size] );
+ m_data.reset( new boost::uint8_t[m_size] );
// m_bounds->m_x_min = 0.0f;
// m_bounds->m_x_max = 1.0f;
@@ -540,13 +540,13 @@
std::auto_ptr<rgba> im ( image::create_rgba(j_in->get_width(),
j_in->get_height()) );
- boost::scoped_array<uint8_t> line ( new
uint8_t[3*j_in->get_width()] );
+ boost::scoped_array<boost::uint8_t> line ( new
boost::uint8_t[3*j_in->get_width()] );
for (int y = 0; y < j_in->get_height(); y++)
{
j_in->read_scanline(line.get());
- uint8_t* data = im->scanline(y);
+ boost::uint8_t* data = im->scanline(y);
for (int x = 0; x < j_in->get_width(); x++)
{
data[4*x+0] = line[3*x+0];
@@ -583,7 +583,7 @@
for (size_t y = 0; y < imHeight; y++)
{
- uint8_t* p = im->scanline(y);
+ boost::uint8_t* p = im->scanline(y);
for (size_t x = 0; x < imWidth; x++)
{
out->write_byte(p[x * 4]);
Index: libbase/image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/image.h 10 Dec 2007 17:45:32 -0000 1.18
+++ libbase/image.h 12 Dec 2007 10:06:59 -0000 1.19
@@ -42,7 +42,7 @@
:
m_type(o.m_type),
m_size(o.size()),
- m_data(new uint8_t[m_size]),
+ m_data(new boost::uint8_t[m_size]),
m_width(o.width()),
m_height(o.height()),
m_pitch(o.m_pitch)
@@ -52,7 +52,7 @@
- image_base(uint8_t *data, int width, int height, int pitch,
id_image type);
+ image_base(boost::uint8_t *data, int width, int height, int
pitch, id_image type);
/// Construct an image_base allocating data for height*pitch
bytes
image_base(int width, int height, int pitch, id_image type);
@@ -86,7 +86,7 @@
///
/// @param data buffer to copy data from.
///
- void update(uint8_t* data);
+ void update(boost::uint8_t* data);
/// Copy image data from another image data
//
@@ -98,13 +98,13 @@
void update(const image_base& from);
/// Return a pointer to the underlying data
- uint8_t* data() { return m_data.get(); }
+ boost::uint8_t* data() { return m_data.get(); }
/// Return a pointer to first byte of given line
- DSOEXPORT uint8_t* scanline(size_t y);
+ DSOEXPORT boost::uint8_t* scanline(size_t y);
/// Return a read-only pointer to first byte of given line
- DSOEXPORT const uint8_t* scanline(size_t y) const
+ DSOEXPORT const boost::uint8_t* scanline(size_t y) const
{
return const_cast<image_base*>(this)->scanline(y);
}
@@ -127,7 +127,7 @@
size_t m_size;
/// Data bytes, geometry defined by members below
- boost::scoped_array<uint8_t> m_data;
+ boost::scoped_array<boost::uint8_t> m_data;
/// Width of image, in pixels
size_t m_width;
@@ -196,13 +196,13 @@
//
/// TODO: move in base class ?
///
- void set_pixel(size_t x, size_t y, uint8_t r, uint8_t g,
uint8_t b, uint8_t a);
+ void set_pixel(size_t x, size_t y, boost::uint8_t r,
boost::uint8_t g, boost::uint8_t b, boost::uint8_t a);
/// Set alpha value for given pixel
//
/// TODO: move in base class ?
///
- void set_alpha(size_t x, size_t y, uint8_t a);
+ void set_alpha(size_t x, size_t y, boost::uint8_t a);
// See dox in base class
bool make_next_miplevel();
@@ -233,7 +233,7 @@
//
/// TODO: move in base class ?
///
- void set_pixel(size_t x, size_t y, uint8_t a);
+ void set_pixel(size_t x, size_t y, boost::uint8_t a);
// Bitwise content comparison.
bool operator==(const alpha& a) const;
Index: libbase/image_filters.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image_filters.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/image_filters.cpp 30 Oct 2007 18:55:41 -0000 1.17
+++ libbase/image_filters.cpp 12 Dec 2007 10:06:59 -0000 1.18
@@ -11,7 +11,7 @@
// converted from K&R C to C-like C++, changed the interfaces a bit,
// etc.
-/* $Id: image_filters.cpp,v 1.17 2007/10/30 18:55:41 strk Exp $ */
+/* $Id: image_filters.cpp,v 1.18 2007/12/12 10:06:59 zoulunkai Exp $ */
#include "image.h"
#include "utility.h"
@@ -42,7 +42,7 @@
}
-void get_row(uint8_t* row, image::rgb* image, int x0, int xsize, int y)
+void get_row(boost::uint8_t* row, image::rgb* image, int x0, int xsize, int
y)
// Copy RGB data from the specified row into the given buffer.
{
y = iclamp(y, 0, image->height() - 1);
@@ -50,11 +50,11 @@
if (x1 >= image->width()) {
// clip, then extend.
int extra_pixels = x1 - image->width() + 1;
- uint8_t* p = ((uint8_t*) image->data()) + (y * image->pitch());
+ boost::uint8_t* p = ((boost::uint8_t*) image->data()) + (y *
image->pitch());
memcpy(row, p + x0 * 3, (3 * (image->width() - x0)));
// repeat last pixel
p = p + (image->width() - 1) * 3;
- uint8_t* q = row + (image->width() - x0) * 3;
+ boost::uint8_t* q = row + (image->width() - x0) * 3;
while (extra_pixels > 0) {
*(q + 0) = *(p + 0);
*(q + 1) = *(p + 1);
@@ -65,12 +65,12 @@
}
else
{
- memcpy(row, ((uint8_t*) image->data()) + (y * image->pitch()) + x0
* 3, (3 * xsize));
+ memcpy(row, ((boost::uint8_t*) image->data()) + (y *
image->pitch()) + x0 * 3, (3 * xsize));
}
}
-void get_row(uint8_t* row, image::rgba* image, int x0, int xsize, int y)
+void get_row(boost::uint8_t* row, image::rgba* image, int x0, int xsize, int
y)
// Copy RGBA data from the specified row into the given buffer.
{
y = iclamp(y, 0, image->height() - 1);
@@ -78,11 +78,11 @@
if (x1 >= image->width()) {
// clip, then extend.
int extra_pixels = x1 - image->width() + 1;
- uint8_t* p = ((uint8_t*) image->data()) + (y * image->pitch());
+ boost::uint8_t* p = ((boost::uint8_t*) image->data()) + (y *
image->pitch());
memcpy(row, p + x0 * 4, (4 * (image->width() - x0)));
// repeat last pixel
p = p + (image->width() - 1) * 4;
- uint8_t* q = row + (image->width() - x0) * 4;
+ boost::uint8_t* q = row + (image->width() - x0) * 4;
while (extra_pixels > 0) {
*(q + 0) = *(p + 0);
*(q + 1) = *(p + 1);
@@ -94,12 +94,12 @@
}
else
{
- memcpy(row, ((uint8_t*) image->data()) + (y * image->pitch()) + x0
* 4, (4 * xsize));
+ memcpy(row, ((boost::uint8_t*) image->data()) + (y *
image->pitch()) + x0 * 4, (4 * xsize));
}
}
-void get_column(uint8_t* column, image::rgb* image, int x)
+void get_column(boost::uint8_t* column, image::rgb* image, int x)
// Copy RGB data from the specified column into the given buffer.
{
@@ -109,7 +109,7 @@
}
int d = image->pitch();
- uint8_t* p = ((uint8_t*) image->data()) + x * 3;
+ boost::uint8_t* p = ((boost::uint8_t*) image->data()) + x * 3;
for (int i = image->height(); i-- > 0; p += d) {
*column++ = *p;
*column++ = *(p + 1);
@@ -118,7 +118,7 @@
}
-void get_column(uint8_t* column, image::rgba* image, int x)
+void get_column(boost::uint8_t* column, image::rgba* image, int x)
// Copy RGBA data from the specified column into the given buffer.
{
if ((x < 0) || (x >= image->width())) {
@@ -127,7 +127,7 @@
}
int d = image->pitch();
- uint8_t* p = ((uint8_t*) image->data()) + x * 4;
+ boost::uint8_t* p = ((boost::uint8_t*) image->data()) + x * 4;
for (int i = image->height(); i-- > 0; p += d) {
*column++ = *p;
*column++ = *(p + 1);
@@ -143,7 +143,7 @@
{
static image::rgb* im = NULL;
static int yy = -1;
- static uint8_t* p = NULL;
+ static boost::uint8_t* p = NULL;
if ((x < 0) || (x >= image->width()) || (y < 0) || (y >= image->height()))
{
abort();
@@ -152,7 +152,7 @@
if ((im != image) || (yy != y)) {
im = image;
yy = y;
- p = ((uint8_t*) image->data()) + (y * image->pitch());
+ p = ((boost::uint8_t*) image->data()) + (y * image->pitch());
}
p[x * 3 + 0] = iclamp(frnd(r), 0, 255);
p[x * 3 + 1] = iclamp(frnd(g), 0, 255);
@@ -166,7 +166,7 @@
{
static image::rgba* im = NULL;
static int yy = -1;
- static uint8_t* p = NULL;
+ static boost::uint8_t* p = NULL;
if ((x < 0) || (x >= image->width()) || (y < 0) || (y >= image->height()))
{
abort();
@@ -175,7 +175,7 @@
if ((im != image) || (yy != y)) {
im = image;
yy = y;
- p = ((uint8_t*) image->data()) + (y * image->pitch());
+ p = ((boost::uint8_t*) image->data()) + (y * image->pitch());
}
p[x * 4 + 0] = iclamp(frnd(r), 0, 255);
p[x * 4 + 1] = iclamp(frnd(g), 0, 255);
@@ -392,7 +392,7 @@
int n; /* pixel number */
float center; int left, right; /* filter calculation variables */
float width, fscale, weight; /* filter calculation variables */
- uint8_t* raster; /* a row or column of pixels */
+ boost::uint8_t* raster; /* a row or column of pixels */
std::vector< std::vector<CONTRIB> > contrib;
@@ -452,7 +452,7 @@
}
/* apply filter to zoom horizontally from src to tmp */
- raster = (uint8_t*) my_calloc(in_window_w, 3);
+ raster = (boost::uint8_t*) my_calloc(in_window_w, 3);
for (k = 0; k < tmp->height(); ++k) {
get_row(raster, in, int(floorf(in_x0)), in_window_w, k);
for (i = 0; i < tmp->width(); ++i) {
@@ -504,7 +504,7 @@
}
/* apply filter to zoom vertically from tmp to dst */
- raster = (uint8_t*) my_calloc(tmp->height(), 3);
+ raster = (boost::uint8_t*) my_calloc(tmp->height(), 3);
for (k = 0; k < tmp->width(); ++k) {
get_column(raster, tmp.get(), k);
for (i = 0; i < out_height; ++i) {
@@ -557,7 +557,7 @@
int n; /* pixel number */
float center; int left, right; /* filter calculation variables */
float width, fscale, weight; /* filter calculation variables */
- uint8_t* raster; /* a row or column of pixels */
+ boost::uint8_t* raster; /* a row or column of pixels */
std::vector< std::vector<CONTRIB> > contrib;
@@ -617,7 +617,7 @@
}
/* apply filter to zoom horizontally from src to tmp */
- raster = (uint8_t*) my_calloc(in_window_w, 4);
+ raster = (boost::uint8_t*) my_calloc(in_window_w, 4);
for (k = 0; k < tmp->height(); ++k) {
get_row(raster, in, int(floorf(in_x0)), in_window_w, k);
for (i = 0; i < tmp->width(); ++i) {
@@ -671,7 +671,7 @@
}
/* apply filter to zoom vertically from tmp to dst */
- raster = (uint8_t*) my_calloc(tmp->height(), 4);
+ raster = (boost::uint8_t*) my_calloc(tmp->height(), 4);
for (k = 0; k < tmp->width(); ++k) {
get_column(raster, tmp.get(), k);
for (i = 0; i < out_height; ++i) {
Index: libbase/tu_file.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libbase/tu_file.cpp 1 Dec 2007 00:14:58 -0000 1.22
+++ libbase/tu_file.cpp 12 Dec 2007 10:06:59 -0000 1.23
@@ -483,7 +483,7 @@
{
// @@ bah, should buffer this!
while (src->get_eof() == false) {
- uint8_t b = src->read8();
+ boost::uint8_t b = src->read8();
if (src->get_error()) {
break;
}
Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libbase/tu_file.h 4 Dec 2007 11:45:24 -0000 1.19
+++ libbase/tu_file.h 12 Dec 2007 10:06:59 -0000 1.20
@@ -110,7 +110,7 @@
/// is in error condition, see get_error().
///
boost::uint32_t read_le32() {
- // read8() is uint8_t, so no masks with 0xff are required.
+ // read8() is boost::uint8_t, so no masks with 0xff are required.
boost::uint32_t result = (boost::uint32_t)read8();
result |= (boost::uint32_t)read8() << 8;
result |= (boost::uint32_t)read8() << 16;
@@ -148,10 +148,10 @@
/// is in error condition, see get_error().
///
void write_le32(boost::uint32_t u) {
- write8((uint8_t)u);
- write8((uint8_t)(u>>8));
- write8((uint8_t)(u>>16));
- write8((uint8_t)(u>>24));
+ write8((boost::uint8_t)u);
+ write8((boost::uint8_t)(u>>8));
+ write8((boost::uint8_t)(u>>16));
+ write8((boost::uint8_t)(u>>24));
}
/// \brief Write a 16-bit word to a little-endian stream.
@@ -160,8 +160,8 @@
/// is in error condition, see get_error().
///
void write_le16(boost::uint16_t u) {
- write8((uint8_t)u);
- write8((uint8_t)(u>>8));
+ write8((boost::uint8_t)u);
+ write8((boost::uint8_t)(u>>8));
}
/// \brief Read a single byte from the stream
@@ -169,14 +169,14 @@
/// TODO: define what happens when the stream
/// is in error condition, see get_error().
///
- uint8_t read_byte() { return read8(); }
+ boost::uint8_t read_byte() { return read8(); }
/// \brief write a single byte to the stream
//
/// TODO: define what happens when the stream
/// is in error condition, see get_error().
///
- void write_byte(uint8_t u) { write8(u); }
+ void write_byte(boost::uint8_t u) { write8(u); }
/// \brief Read the given number of bytes from the stream
//
@@ -292,8 +292,8 @@
m_read(&u, 2, m_data);
return u;
}
- uint8_t read8() {
- uint8_t u;
+ boost::uint8_t read8() {
+ boost::uint8_t u;
m_read(&u, 1, m_data);
return u;
}
@@ -307,7 +307,7 @@
void write16(boost::uint16_t u) {
m_write(&u, 2, m_data);
}
- void write8(uint8_t u) {
+ void write8(boost::uint8_t u) {
m_write(&u, 1, m_data);
}
Index: libmedia/AudioDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoder.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libmedia/AudioDecoder.h 4 Dec 2007 11:45:25 -0000 1.6
+++ libmedia/AudioDecoder.h 12 Dec 2007 10:06:59 -0000 1.7
@@ -16,7 +16,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: AudioDecoder.h,v 1.6 2007/12/04 11:45:25 strk Exp $
+// $Id: AudioDecoder.h,v 1.7 2007/12/12 10:06:59 zoulunkai Exp $
#ifndef __AUDIODECODER_H__
#define __AUDIODECODER_H__
@@ -77,7 +77,7 @@
/// @return a pointer to the decoded data, or NULL if decoding fails.
/// The caller owns the decoded data.
///
- virtual uint8_t* decode(uint8_t* /*input*/, boost::uint32_t
/*inputSize*/, boost::uint32_t& /*outputSize*/, boost::uint32_t&
/*decodedData*/, bool /*parse*/) { return NULL; }
+ virtual boost::uint8_t* decode(boost::uint8_t* /*input*/,
boost::uint32_t /*inputSize*/, boost::uint32_t& /*outputSize*/,
boost::uint32_t& /*decodedData*/, bool /*parse*/) { return NULL; }
};
Index: libmedia/AudioDecoderNellymoser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/AudioDecoderNellymoser.cpp 4 Dec 2007 11:45:25 -0000 1.5
+++ libmedia/AudioDecoderNellymoser.cpp 12 Dec 2007 10:06:59 -0000 1.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderNellymoser.cpp,v 1.5 2007/12/04 11:45:25 strk Exp $
+// $Id: AudioDecoderNellymoser.cpp,v 1.6 2007/12/12 10:06:59 zoulunkai Exp $
// This file incorporates work covered by the following copyright and
permission
// notice:
@@ -770,7 +770,7 @@
}
-uint8_t* AudioDecoderNellymoser::decode(uint8_t* input, boost::uint32_t
inputSize, boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool
/*parse*/)
+boost::uint8_t* AudioDecoderNellymoser::decode(boost::uint8_t* input,
boost::uint32_t inputSize, boost::uint32_t& outputSize, boost::uint32_t&
decodedBytes, bool /*parse*/)
{
float float_buf[256];
@@ -786,7 +786,7 @@
inputSize -= 64;
}
- uint8_t* tmp_raw_buffer = reinterpret_cast<uint8_t*>(out_buf_start);
+ boost::uint8_t* tmp_raw_buffer =
reinterpret_cast<boost::uint8_t*>(out_buf_start);
boost::uint32_t tmp_raw_buffer_size = out_buf_size * 2;
// If we need to convert samplerate or/and from mono to stereo...
@@ -812,7 +812,7 @@
// Move the new data to the sound-struct
delete[] tmp_raw_buffer;
- tmp_raw_buffer = reinterpret_cast<uint8_t*>(adjusted_data);
+ tmp_raw_buffer =
reinterpret_cast<boost::uint8_t*>(adjusted_data);
tmp_raw_buffer_size = adjusted_size;
} else {
Index: libmedia/AudioDecoderNellymoser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderNellymoser.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/AudioDecoderNellymoser.h 4 Dec 2007 11:45:25 -0000 1.5
+++ libmedia/AudioDecoderNellymoser.h 12 Dec 2007 10:06:59 -0000 1.6
@@ -16,7 +16,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: AudioDecoderNellymoser.h,v 1.5 2007/12/04 11:45:25 strk Exp $
+// $Id: AudioDecoderNellymoser.h,v 1.6 2007/12/12 10:06:59 zoulunkai Exp $
// This file incorporates work covered by the following copyright and
permission
// notice:
@@ -79,7 +79,7 @@
bool setup(AudioInfo* info);
bool setup(SoundInfo* info);
- uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse);
+ boost::uint8_t* decode(boost::uint8_t* input, boost::uint32_t
inputSize, boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool
parse);
private:
Index: libmedia/AudioDecoderSimple.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libmedia/AudioDecoderSimple.cpp 4 Dec 2007 22:03:30 -0000 1.11
+++ libmedia/AudioDecoderSimple.cpp 12 Dec 2007 10:06:59 -0000 1.12
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: AudioDecoderSimple.cpp,v 1.11 2007/12/04 22:03:30 strk Exp $
+// $Id: AudioDecoderSimple.cpp,v 1.12 2007/12/12 10:06:59 zoulunkai Exp $
#include "AudioDecoderSimple.h"
#include "utility.h"
@@ -261,13 +261,13 @@
unsigned char* input,
boost::uint32_t input_size) // This is also the number of u8bit samples
{
- boost::scoped_array<uint8_t> in_data ( new uint8_t[input_size] );
+ boost::scoped_array<boost::uint8_t> in_data ( new
boost::uint8_t[input_size] );
boost::int16_t *out_data = new boost::int16_t[input_size];
memcpy((char *)in_data.get(), input, input_size);
// Convert 8-bit to 16
- uint8_t *inp = in_data.get();
+ boost::uint8_t *inp = in_data.get();
boost::int16_t *outp = out_data;
for (unsigned int i = input_size; i>0; i--) {
*outp++ = ((boost::int16_t)(*inp++) - 128) * 256;
@@ -318,7 +318,7 @@
}
}
-uint8_t* AudioDecoderSimple::decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool /*parse*/)
+boost::uint8_t* AudioDecoderSimple::decode(boost::uint8_t* input,
boost::uint32_t inputSize, boost::uint32_t& outputSize, boost::uint32_t&
decodedBytes, bool /*parse*/)
{
unsigned char* decodedData = NULL;
@@ -369,8 +369,8 @@
union u {
boost::uint16_t s;
struct {
- uint8_t c0;
- uint8_t c1;
+ boost::uint8_t c0;
+ boost::uint8_t c1;
} c;
} u = { 0x0001 };
@@ -396,7 +396,7 @@
// ???, this should only decode ADPCM, RAW and UNCOMPRESSED
}
- uint8_t* tmp_raw_buffer = decodedData;
+ boost::uint8_t* tmp_raw_buffer = decodedData;
boost::uint32_t tmp_raw_buffer_size = 0;
// If we need to convert samplerate or/and from mono to stereo...
@@ -422,7 +422,7 @@
// Move the new data to the sound-struct
delete[] tmp_raw_buffer;
- tmp_raw_buffer = reinterpret_cast<uint8_t*>(adjusted_data);
+ tmp_raw_buffer =
reinterpret_cast<boost::uint8_t*>(adjusted_data);
tmp_raw_buffer_size = adjusted_size;
} else {
Index: libmedia/AudioDecoderSimple.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoderSimple.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/AudioDecoderSimple.h 4 Dec 2007 11:45:25 -0000 1.5
+++ libmedia/AudioDecoderSimple.h 12 Dec 2007 10:06:59 -0000 1.6
@@ -16,7 +16,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: AudioDecoderSimple.h,v 1.5 2007/12/04 11:45:25 strk Exp $
+// $Id: AudioDecoderSimple.h,v 1.6 2007/12/12 10:06:59 zoulunkai Exp $
#ifndef __AUDIODECODERSIMPLE_H__
#define __AUDIODECODERSIMPLE_H__
@@ -42,7 +42,7 @@
bool setup(SoundInfo* info);
- uint8_t* decode(uint8_t* input, boost::uint32_t inputSize,
boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool parse);
+ boost::uint8_t* decode(boost::uint8_t* input, boost::uint32_t
inputSize, boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool
parse);
private:
Index: libmedia/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/FLVParser.cpp 4 Dec 2007 11:45:25 -0000 1.4
+++ libmedia/FLVParser.cpp 12 Dec 2007 10:06:59 -0000 1.5
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.cpp,v 1.4 2007/12/04 11:45:25 strk Exp $
+// $Id: FLVParser.cpp,v 1.5 2007/12/12 10:06:59 zoulunkai Exp $
#include "FLVParser.h"
#include "amf.h"
@@ -173,7 +173,7 @@
frame->timestamp = _audioFrames[_nextAudioFrame]->timestamp;
_stream->set_position(_audioFrames[_nextAudioFrame]->dataPosition);
- frame->data = new uint8_t[frame->dataSize + PADDING_BYTES];
+ frame->data = new boost::uint8_t[frame->dataSize +
PADDING_BYTES];
size_t bytesread = _stream->read_bytes(frame->data,
frame->dataSize);
memset(frame->data + bytesread, 0, PADDING_BYTES);
@@ -188,7 +188,7 @@
frame->timestamp = _videoFrames[_nextVideoFrame]->timestamp;
_stream->set_position(_videoFrames[_nextVideoFrame]->dataPosition);
- frame->data = new uint8_t[frame->dataSize + PADDING_BYTES];
+ frame->data = new boost::uint8_t[frame->dataSize +
PADDING_BYTES];
size_t bytesread = _stream->read_bytes(frame->data,
frame->dataSize);
memset(frame->data + bytesread, 0, PADDING_BYTES);
@@ -220,7 +220,7 @@
frame->tag = 8;
_stream->set_position(_audioFrames[_nextAudioFrame]->dataPosition);
- frame->data = new uint8_t[_audioFrames[_nextAudioFrame]->dataSize +
+ frame->data = new
boost::uint8_t[_audioFrames[_nextAudioFrame]->dataSize +
PADDING_BYTES];
size_t bytesread = _stream->read_bytes(frame->data,
_audioFrames[_nextAudioFrame]->dataSize);
memset(frame->data + bytesread, 0, PADDING_BYTES);
@@ -261,7 +261,7 @@
frame->tag = 9;
_stream->set_position(_videoFrames[_nextVideoFrame]->dataPosition);
- frame->data = new uint8_t[_videoFrames[_nextVideoFrame]->dataSize +
+ frame->data = new
boost::uint8_t[_videoFrames[_nextVideoFrame]->dataSize +
PADDING_BYTES];
size_t bytesread = _stream->read_bytes(frame->data,
_videoFrames[_nextVideoFrame]->dataSize);
memset(frame->data + bytesread, 0, PADDING_BYTES);
@@ -533,7 +533,7 @@
if (_stream->set_position(_lastParsedPosition+4) != 0) return false;
// Read the tag info
- uint8_t tag[12];
+ boost::uint8_t tag[12];
_stream->read_bytes(tag, 12);
// Extract length and timestamp
@@ -589,7 +589,7 @@
// Extract the video size from the videodata header
_stream->set_position(frame->dataPosition);
- uint8_t videohead[12];
+ boost::uint8_t videohead[12];
_stream->read_bytes(videohead, 12);
if (codec == VIDEO_CODEC_H263) {
@@ -681,7 +681,7 @@
_stream->set_position(0); //_lt.seek(0);
// Read the header
- uint8_t header[9];
+ boost::uint8_t header[9];
_stream->read_bytes(header, 9); //_lt.read(header, 9);
// Check if this is really a FLV file
@@ -704,7 +704,7 @@
return true;
}
-inline boost::uint32_t FLVParser::getUInt24(uint8_t* in)
+inline boost::uint32_t FLVParser::getUInt24(boost::uint8_t* in)
{
// The bits are in big endian order
return (in[0] << 16) | (in[1] << 8) | in[2];
Index: libmedia/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/FLVParser.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/FLVParser.h 4 Dec 2007 11:45:25 -0000 1.5
+++ libmedia/FLVParser.h 12 Dec 2007 10:06:59 -0000 1.6
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: FLVParser.h,v 1.5 2007/12/04 11:45:25 strk Exp $
+// $Id: FLVParser.h,v 1.6 2007/12/12 10:06:59 zoulunkai Exp $
// Information about the FLV format can be found at http://osflash.org/flv
@@ -221,7 +221,7 @@
bool parseHeader();
// Functions used to extract numbers from the file
- inline boost::uint32_t getUInt24(uint8_t* in);
+ inline boost::uint32_t getUInt24(boost::uint8_t* in);
/// The interface to the file, externally owned
// tu_file* _stream;
Index: libmedia/MediaBuffer.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaBuffer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/MediaBuffer.h 4 Dec 2007 11:45:25 -0000 1.7
+++ libmedia/MediaBuffer.h 12 Dec 2007 10:06:59 -0000 1.8
@@ -16,7 +16,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: MediaBuffer.h,v 1.7 2007/12/04 11:45:25 strk Exp $
+// $Id: MediaBuffer.h,v 1.8 2007/12/12 10:06:59 zoulunkai Exp $
#ifndef __MEDIABUFFER_H__
#define __MEDIABUFFER_H__
@@ -55,11 +55,11 @@
boost::uint32_t m_size;
/// Pointer to the data. The data is owned by this class.
- uint8_t* m_data;
+ boost::uint8_t* m_data;
/// Pointer to where the data should be used from. Used with audio,
since we
/// don't always use all the data.
- uint8_t* m_ptr;
+ boost::uint8_t* m_ptr;
/// Timestamp in millisec
boost::uint32_t m_pts;
Index: libmedia/MediaDecoder.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaDecoder.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libmedia/MediaDecoder.cpp 4 Dec 2007 11:45:26 -0000 1.3
+++ libmedia/MediaDecoder.cpp 12 Dec 2007 10:06:59 -0000 1.4
@@ -16,7 +16,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: MediaDecoder.cpp,v 1.3 2007/12/04 11:45:26 strk Exp $
+// $Id: MediaDecoder.cpp,v 1.4 2007/12/12 10:06:59 zoulunkai Exp $
#include "MediaDecoder.h"
@@ -135,7 +135,7 @@
boost::uint32_t datasize;
boost::uint32_t bufsize;
- uint8_t* ptr = _audioDecoder->decode(packet->data, packet->dataSize,
bufsize, datasize, false);
+ boost::uint8_t* ptr = _audioDecoder->decode(packet->data,
packet->dataSize, bufsize, datasize, false);
if (bufsize > 0 && ptr != NULL)
{
Index: libmedia/MediaParser.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/MediaParser.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libmedia/MediaParser.h 4 Dec 2007 11:45:26 -0000 1.11
+++ libmedia/MediaParser.h 12 Dec 2007 10:07:00 -0000 1.12
@@ -16,7 +16,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: MediaParser.h,v 1.11 2007/12/04 11:45:26 strk Exp $
+// $Id: MediaParser.h,v 1.12 2007/12/12 10:07:00 zoulunkai Exp $
#ifndef __MEDIAPARSER_H__
#define __MEDIAPARSER_H__
@@ -188,9 +188,9 @@
{
public:
boost::uint32_t dataSize;
- uint8_t* data;
+ boost::uint8_t* data;
boost::uint64_t timestamp;
- uint8_t tag;
+ boost::uint8_t tag;
};
/// \brief
Index: libmedia/VideoDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/VideoDecoder.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libmedia/VideoDecoder.h 4 Dec 2007 11:45:26 -0000 1.9
+++ libmedia/VideoDecoder.h 12 Dec 2007 10:07:00 -0000 1.10
@@ -16,7 +16,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: VideoDecoder.h,v 1.9 2007/12/04 11:45:26 strk Exp $
+// $Id: VideoDecoder.h,v 1.10 2007/12/12 10:07:00 zoulunkai Exp $
#ifndef __VIDEODECODER_H__
#define __VIDEODECODER_H__
@@ -96,7 +96,7 @@
/// @return a pointer to the decoded data, or NULL if decoding fails.
/// The caller owns the decoded data.
///
- virtual uint8_t* decode(uint8_t* /*input*/, boost::uint32_t
/*inputSize*/, boost::uint32_t& /*outputSize*/) { return NULL; }
+ virtual boost::uint8_t* decode(boost::uint8_t* /*input*/,
boost::uint32_t /*inputSize*/, boost::uint32_t& /*outputSize*/) { return NULL; }
/// Decodes a frame and returns an image::base containing it
//
@@ -109,7 +109,7 @@
/// @return a pointer to the image with the decoded data, or NULL if
decoding fails.
/// The caller owns the decoded data.
///
- virtual std::auto_ptr<image::image_base> decodeToImage(uint8_t*
/*input*/, boost::uint32_t /*inputSize*/) { return
std::auto_ptr<image::image_base>(NULL); }
+ virtual std::auto_ptr<image::image_base> decodeToImage(boost::uint8_t*
/*input*/, boost::uint32_t /*inputSize*/) { return
std::auto_ptr<image::image_base>(NULL); }
};
Index: libmedia/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sound_handler.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sound_handler.h 4 Dec 2007 11:45:26 -0000 1.5
+++ libmedia/sound_handler.h 12 Dec 2007 10:07:00 -0000 1.6
@@ -18,7 +18,7 @@
//
//
-/* $Id: sound_handler.h,v 1.5 2007/12/04 11:45:26 strk Exp $ */
+/* $Id: sound_handler.h,v 1.6 2007/12/12 10:07:00 zoulunkai Exp $ */
/// \page sound_handler_intro Sound handler introduction
///
@@ -70,7 +70,7 @@
///
/// @param size number of bytes in the new data
///
- Buffer(uint8_t* newData, size_t size)
+ Buffer(boost::uint8_t* newData, size_t size)
:
_capacity(size),
_data(newData),
@@ -84,7 +84,7 @@
///
/// @param size number of bytes in the new data
///
- void append(uint8_t* newData, size_t size)
+ void append(boost::uint8_t* newData, size_t size)
{
if ( ! _capacity )
{
@@ -109,7 +109,7 @@
///
/// @param size number of bytes in the new data
///
- void assign(uint8_t* newData, size_t size)
+ void assign(boost::uint8_t* newData, size_t size)
{
if ( ! _capacity )
{
@@ -130,23 +130,23 @@
delete [] newData;
}
- const uint8_t* data() const
+ const boost::uint8_t* data() const
{
return _data;
}
- uint8_t* data()
+ boost::uint8_t* data()
{
return _data;
}
- const uint8_t* data(size_t pos) const
+ const boost::uint8_t* data(size_t pos) const
{
assert(pos < _capacity);
return _data+pos;
}
- uint8_t* data(size_t pos)
+ boost::uint8_t* data(size_t pos)
{
assert(pos < _capacity);
return _data+pos;
@@ -166,8 +166,8 @@
// TODO: use smalles power of 2 bigger then newCapacity
_capacity = std::max(newCapacity, _capacity*2);
- uint8_t* tmp = _data;
- _data = new uint8_t[_capacity];
+ boost::uint8_t* tmp = _data;
+ _data = new boost::uint8_t[_capacity];
if ( tmp )
{
if ( _size ) memcpy(_data, tmp, _size);
@@ -189,7 +189,7 @@
size_t _capacity;
- uint8_t* _data;
+ boost::uint8_t* _data;
size_t _size;
@@ -211,7 +211,7 @@
// See attach_aux_streamer
// TODO: change third parameter type to unsigned
- typedef bool (*aux_streamer_ptr)(void *udata, uint8_t *stream, int len);
+ typedef bool (*aux_streamer_ptr)(void *udata, boost::uint8_t *stream,
int len);
/// Used to control volume for event sounds. It basically tells that
from
/// sample X the volume for left out is Y and for right out is Z.
Several
Index: server/BevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BevelFilter.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/BevelFilter.h 4 Dec 2007 11:45:27 -0000 1.6
+++ server/BevelFilter.h 12 Dec 2007 10:07:00 -0000 1.7
@@ -15,7 +15,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: BevelFilter.h,v 1.6 2007/12/04 11:45:27 strk Exp $ */
+/* $Id: BevelFilter.h,v 1.7 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_BEVELFILTER_H
#define GNASH_BEVELFILTER_H
@@ -54,9 +54,9 @@
{ return; }
BevelFilter(float distance, float angle, boost::uint32_t hcolor,
- uint8_t halpha, boost::uint32_t scolor, uint8_t salpha,
+ boost::uint8_t halpha, boost::uint32_t scolor, boost::uint8_t salpha,
float blurX, float blurY, float strength,
- uint8_t quality, bevel_type type, bool knockout) :
+ boost::uint8_t quality, bevel_type type, bool knockout) :
m_distance(distance), m_angle(angle), m_highlightColor(hcolor),
m_highlightAlpha(halpha), m_shadowColor(scolor), m_shadowAlpha(salpha),
m_blurX(blurX), m_blurY(blurY), m_strength(strength),
@@ -67,13 +67,13 @@
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
boost::uint32_t m_highlightColor; // Color of the highlight.
- uint8_t m_highlightAlpha; // Alpha of the highlight.
+ boost::uint8_t m_highlightAlpha; // Alpha of the highlight.
boost::uint32_t m_shadowColor; // RGB color.
- uint8_t m_shadowAlpha; // Alpha strength, as a percentage(?)
+ boost::uint8_t m_shadowAlpha; // Alpha strength, as a percentage(?)
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
float m_strength; // How strong is the filter.
- uint8_t m_quality; // How many times to apply the filter.
+ boost::uint8_t m_quality; // How many times to apply the filter.
bevel_type m_type; // The type of filter. (Rendered as string in AS)
bool m_knockout; // If true, render only the filter effect.
};
Index: server/BlurFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/BlurFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/BlurFilter.h 26 Sep 2007 19:00:46 -0000 1.4
+++ server/BlurFilter.h 12 Dec 2007 10:07:00 -0000 1.5
@@ -15,7 +15,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: BlurFilter.h,v 1.4 2007/09/26 19:00:46 strk Exp $ */
+/* $Id: BlurFilter.h,v 1.5 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_BLURFILTER_H
#define GNASH_BLURFILTER_H
@@ -26,7 +26,7 @@
#include "BitmapFilter.h"
-#include <boost/cstdint.hpp> // for uint8_t
+#include <boost/cstdint.hpp> // for boost::uint8_t
namespace gnash {
@@ -43,14 +43,14 @@
m_blurX(0.0f), m_blurY(0.0f), m_quality(0)
{ return; }
- BlurFilter(float blurX, float blurY, uint8_t quality) :
+ BlurFilter(float blurX, float blurY, boost::uint8_t quality) :
m_blurX(blurX), m_blurY(blurY), m_quality(quality)
{ return; }
protected:
float m_blurX; // How much horizontal blur.
float m_blurY; // How much vertical blur.
- uint8_t m_quality; // How many passes to take.
+ boost::uint8_t m_quality; // How many passes to take.
};
} // Namespace gnash
Index: server/ConvolutionFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/ConvolutionFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/ConvolutionFilter.h 4 Dec 2007 11:45:27 -0000 1.5
+++ server/ConvolutionFilter.h 12 Dec 2007 10:07:00 -0000 1.6
@@ -15,7 +15,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: ConvolutionFilter.h,v 1.5 2007/12/04 11:45:27 strk Exp $ */
+/* $Id: ConvolutionFilter.h,v 1.6 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_CONVOLUTIONFILTER_H
#define GNASH_CONVOLUTIONFILTER_H
@@ -45,25 +45,25 @@
m_preserveAlpha(false), m_clamp(false), m_color(), m_alpha()
{ return; }
- ConvolutionFilter(uint8_t matrixX, uint8_t matrixY,
+ ConvolutionFilter(boost::uint8_t matrixX, boost::uint8_t matrixY,
std::vector<float> a_matrix,
float divisor, float bias, bool preserveAlpha, bool clamp,
boost::uint32_t color,
- uint8_t alpha) :
+ boost::uint8_t alpha) :
m_matrixX(matrixX), m_matrixY(matrixY), m_matrix(a_matrix),
m_divisor(divisor), m_bias(bias), m_preserveAlpha(preserveAlpha),
m_clamp(clamp), m_color(color), m_alpha(alpha)
{ return; }
protected:
- uint8_t m_matrixX; // Number of columns
- uint8_t m_matrixY; // Number of rows
+ boost::uint8_t m_matrixX; // Number of columns
+ boost::uint8_t m_matrixY; // Number of rows
std::vector<float> m_matrix; // The convolution matrix
float m_divisor;
float m_bias;
bool m_preserveAlpha; // If true, don't convolute the alpha channel
bool m_clamp; // Whether or not to clamp
boost::uint32_t m_color; // For off-image pixels
- uint8_t m_alpha; // For off-image pixels
+ boost::uint8_t m_alpha; // For off-image pixels
};
} // Namespace gnash
Index: server/DropShadowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/DropShadowFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/DropShadowFilter.h 4 Dec 2007 11:45:27 -0000 1.5
+++ server/DropShadowFilter.h 12 Dec 2007 10:07:00 -0000 1.6
@@ -15,7 +15,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: DropShadowFilter.h,v 1.5 2007/12/04 11:45:27 strk Exp $ */
+/* $Id: DropShadowFilter.h,v 1.6 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_DROPSHADOWFILTER_H
#define GNASH_DROPSHADOWFILTER_H
@@ -46,8 +46,8 @@
{ return; }
DropShadowFilter(float distance, float angle, boost::uint32_t color,
- uint8_t alpha, float blurX, float blurY, float strength,
- uint8_t quality, bool inner, bool knockout, bool hideObject) :
+ boost::uint8_t alpha, float blurX, float blurY, float strength,
+ boost::uint8_t quality, bool inner, bool knockout, bool hideObject) :
m_distance(distance), m_angle(angle), m_color(color),
m_alpha(alpha), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
m_quality(quality), m_inner(inner), m_knockout(knockout),
@@ -58,11 +58,11 @@
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
boost::uint32_t m_color; // RGB color.
- uint8_t m_alpha; // Alpha strength, as a percentage(?)
+ boost::uint8_t m_alpha; // Alpha strength, as a percentage(?)
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
float m_strength; // How strong is the filter.
- uint8_t m_quality; // How many times to apply the filter.
+ boost::uint8_t m_quality; // How many times to apply the filter.
bool m_inner; // Is this an inner shadow?
bool m_knockout; // If true, render only the filter effect.
bool m_hideObject; // Does this hide the object?
Index: server/FreetypeGlyphsProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/FreetypeGlyphsProvider.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/FreetypeGlyphsProvider.cpp 4 Dec 2007 11:45:27 -0000 1.17
+++ server/FreetypeGlyphsProvider.cpp 12 Dec 2007 10:07:00 -0000 1.18
@@ -219,8 +219,8 @@
// copy image to alpha
for (int i = 0; i < bitmap.rows; i++)
{
- uint8_t* src = bitmap.buffer + bitmap.pitch * i;
- uint8_t* dst = alpha->scanline(i);
+ boost::uint8_t* src = bitmap.buffer + bitmap.pitch * i;
+ boost::uint8_t* dst = alpha->scanline(i);
int x = bitmap.width;
while (x-- > 0)
{
Index: server/GlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GlowFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/GlowFilter.h 4 Dec 2007 11:45:28 -0000 1.5
+++ server/GlowFilter.h 12 Dec 2007 10:07:00 -0000 1.6
@@ -15,7 +15,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: GlowFilter.h,v 1.5 2007/12/04 11:45:28 strk Exp $ */
+/* $Id: GlowFilter.h,v 1.6 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_GLOWFILTER_H
#define GNASH_GLOWFILTER_H
@@ -46,8 +46,8 @@
{ return; }
GlowFilter(boost::uint32_t color,
- uint8_t alpha, float blurX, float blurY, float strength,
- uint8_t quality, bool inner, bool knockout) :
+ boost::uint8_t alpha, float blurX, float blurY, float strength,
+ boost::uint8_t quality, bool inner, bool knockout) :
m_color(color),
m_alpha(alpha), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
m_quality(quality), m_inner(inner), m_knockout(knockout)
@@ -55,11 +55,11 @@
protected:
boost::uint32_t m_color; // RGB color.
- uint8_t m_alpha; // Alpha strength, as a percentage(?)
+ boost::uint8_t m_alpha; // Alpha strength, as a percentage(?)
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
float m_strength; // How strong is the filter.
- uint8_t m_quality; // How many times to apply the filter.
+ boost::uint8_t m_quality; // How many times to apply the filter.
bool m_inner; // Is this an inner shadow?
bool m_knockout; // If true, render only the filter effect.
};
Index: server/GradientBevelFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientBevelFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/GradientBevelFilter.h 4 Dec 2007 11:45:28 -0000 1.5
+++ server/GradientBevelFilter.h 12 Dec 2007 10:07:00 -0000 1.6
@@ -15,7 +15,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: GradientBevelFilter.h,v 1.5 2007/12/04 11:45:28 strk Exp $ */
+/* $Id: GradientBevelFilter.h,v 1.6 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_GRADIENTBEVELFILTER_H
#define GNASH_GRADIENTBEVELFILTER_H
@@ -55,10 +55,10 @@
GradientBevelFilter(float distance, float angle,
std::vector<boost::uint32_t> colors,
- std::vector<uint8_t> alphas,
- std::vector<uint8_t> ratios,
+ std::vector<boost::uint8_t> alphas,
+ std::vector<boost::uint8_t> ratios,
float blurX, float blurY, float strength,
- uint8_t quality, glow_types type, bool knockout) :
+ boost::uint8_t quality, glow_types type, bool knockout) :
m_distance(distance), m_angle(angle),
m_colors(colors), m_alphas(alphas), m_ratios(ratios),
m_blurX(blurX), m_blurY(blurY), m_strength(strength),
@@ -69,12 +69,12 @@
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
std::vector<boost::uint32_t> m_colors; // Colors of the gradients.
- std::vector<uint8_t> m_alphas; // Alphas of the gradients.
- std::vector<uint8_t> m_ratios; // Ratios of the gradients.
+ std::vector<boost::uint8_t> m_alphas; // Alphas of the gradients.
+ std::vector<boost::uint8_t> m_ratios; // Ratios of the gradients.
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
float m_strength; // How strong is the filter.
- uint8_t m_quality; // How many times to apply the filter.
+ boost::uint8_t m_quality; // How many times to apply the filter.
glow_types m_type; // What type of effect.
bool m_knockout; // If true, render only the filter effect.
};
Index: server/GradientGlowFilter.h
===================================================================
RCS file: /sources/gnash/gnash/server/GradientGlowFilter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/GradientGlowFilter.h 4 Dec 2007 11:45:28 -0000 1.5
+++ server/GradientGlowFilter.h 12 Dec 2007 10:07:00 -0000 1.6
@@ -15,7 +15,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: GradientGlowFilter.h,v 1.5 2007/12/04 11:45:28 strk Exp $ */
+/* $Id: GradientGlowFilter.h,v 1.6 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_GRADIENTGLOWFILTER_H
#define GNASH_GRADIENTGLOWFILTER_H
@@ -56,10 +56,10 @@
GradientGlowFilter(float distance, float angle,
std::vector<boost::uint32_t> colors,
- std::vector<uint8_t> alphas,
- std::vector<uint8_t> ratios,
+ std::vector<boost::uint8_t> alphas,
+ std::vector<boost::uint8_t> ratios,
float blurX, float blurY, float strength,
- uint8_t quality, glow_types type, bool knockout) :
+ boost::uint8_t quality, glow_types type, bool knockout) :
m_distance(distance), m_angle(angle), m_colors(colors),
m_alphas(alphas),
m_ratios(ratios), m_blurX(blurX), m_blurY(blurY), m_strength(strength),
m_quality(quality), m_type(type), m_knockout(knockout)
@@ -69,12 +69,12 @@
float m_distance; // Distance of the filter in pixels.
float m_angle; // Angle of the filter.
std::vector<boost::uint32_t> m_colors; // Colors of the gradients.
- std::vector<uint8_t> m_alphas; // Alphas of the gradients.
- std::vector<uint8_t> m_ratios; // Ratios of the gradients.
+ std::vector<boost::uint8_t> m_alphas; // Alphas of the gradients.
+ std::vector<boost::uint8_t> m_ratios; // Ratios of the gradients.
float m_blurX; // horizontal blur
float m_blurY; // vertical blur
float m_strength; // How strong is the filter.
- uint8_t m_quality; // How many times to apply the filter.
+ boost::uint8_t m_quality; // How many times to apply the filter.
glow_types m_type; // What type of effect.
bool m_knockout; // If true, render only the filter effect.
};
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/array.cpp 3 Dec 2007 18:05:07 -0000 1.85
+++ server/array.cpp 12 Dec 2007 10:07:00 -0000 1.86
@@ -256,7 +256,7 @@
// Note:
// fUniqueSort and fReturnIndexedArray must first be stripped from the flag
as_cmp_fn
-get_basic_cmp(uint8_t flags, as_environment& env)
+get_basic_cmp(boost::uint8_t flags, as_environment& env)
{
as_cmp_fn f;
@@ -309,7 +309,7 @@
// Note:
// fUniqueSort and fReturnIndexedArray must first be stripped from the flag
as_cmp_fn
-get_basic_eq(uint8_t flags, as_environment& env)
+get_basic_eq(boost::uint8_t flags, as_environment& env)
{
as_cmp_fn f;
flags &= ~(as_array_object::fDescending);
@@ -482,8 +482,8 @@
// Convenience function to strip fUniqueSort and fReturnIndexedArray from sort
// flag. Presence of flags recorded in douniq and doindex.
-static inline uint8_t
-flag_preprocess(uint8_t flgs, bool* douniq, bool* doindex)
+static inline boost::uint8_t
+flag_preprocess(boost::uint8_t flgs, bool* douniq, bool* doindex)
{
*douniq = (flgs & as_array_object::fUniqueSort);
*doindex = (flgs & as_array_object::fReturnIndexedArray);
@@ -494,17 +494,17 @@
// Convenience function to process and extract flags from an as_value array
// of flags (as passed to sortOn when sorting on multiple properties)
-std::deque<uint8_t>
+std::deque<boost::uint8_t>
get_multi_flags(std::deque<as_value>::const_iterator itBegin,
std::deque<as_value>::const_iterator itEnd, bool* uniq, bool* index)
{
std::deque<as_value>::const_iterator it = itBegin;
- std::deque<uint8_t> flgs;
+ std::deque<boost::uint8_t> flgs;
// extract fUniqueSort and fReturnIndexedArray from first flag
if (it != itEnd)
{
- uint8_t flag = static_cast<uint8_t>((*it).to_number());
+ boost::uint8_t flag =
static_cast<boost::uint8_t>((*it).to_number());
flag = flag_preprocess(flag, uniq, index);
flgs.push_back(flag);
++it;
@@ -512,7 +512,7 @@
while (it != itEnd)
{
- uint8_t flag = static_cast<uint8_t>((*it).to_number());
+ boost::uint8_t flag =
static_cast<boost::uint8_t>((*it).to_number());
flag &= ~(as_array_object::fReturnIndexedArray);
flag &= ~(as_array_object::fUniqueSort);
flgs.push_back(flag);
@@ -946,7 +946,7 @@
ensureType<as_array_object>(fn.this_ptr);
as_environment& env = fn.env();
- uint8_t flags = 0;
+ boost::uint8_t flags = 0;
if ( fn.nargs == 0 )
{
@@ -955,7 +955,7 @@
}
else if ( fn.nargs == 1 && fn.arg(0).is_number() )
{
- flags=static_cast<uint8_t>(fn.arg(0).to_number());
+ flags=static_cast<boost::uint8_t>(fn.arg(0).to_number());
}
else if ( fn.arg(0).is_as_function() )
{
@@ -964,7 +964,7 @@
bool (*icmp)(int);
if ( fn.nargs == 2 && fn.arg(1).is_number() )
- flags=static_cast<uint8_t>(fn.arg(1).to_number());
+
flags=static_cast<boost::uint8_t>(fn.arg(1).to_number());
if (flags & as_array_object::fDescending) icmp = &int_lt_or_eq;
else icmp = &int_gt;
@@ -1010,7 +1010,7 @@
ensureType<as_array_object>(fn.this_ptr);
as_environment& env = fn.env();
bool do_unique = false, do_index = false;
- uint8_t flags = 0;
+ boost::uint8_t flags = 0;
int sv = VM::get().getSWFVersion();
// cases: sortOn("prop) and sortOn("prop", Array.FLAG)
@@ -1021,7 +1021,7 @@
if ( fn.nargs > 1 && fn.arg(1).is_number() )
{
- flags = static_cast<uint8_t>(fn.arg(1).to_number());
+ flags =
static_cast<boost::uint8_t>(fn.arg(1).to_number());
flags = flag_preprocess(flags, &do_unique, &do_index);
}
as_value_prop avc = as_value_prop(propField,
@@ -1076,11 +1076,11 @@
fBegin = farray->begin(),
fEnd = farray->end();
- std::deque<uint8_t> flgs =
+ std::deque<boost::uint8_t> flgs =
get_multi_flags(fBegin, fEnd,
&do_unique, &do_index);
- std::deque<uint8_t>::const_iterator it =
+ std::deque<boost::uint8_t>::const_iterator it =
flgs.begin();
while (it != flgs.end())
@@ -1102,8 +1102,8 @@
// case: sortOn(["prop1", "prop2"], Array.FLAG)
else if ( fn.arg(1).is_number() )
{
- uint8_t flags =
- static_cast<uint8_t>(fn.arg(1).to_number());
+ boost::uint8_t flags =
+
static_cast<boost::uint8_t>(fn.arg(1).to_number());
flag_preprocess(flags, &do_unique, &do_index);
as_cmp_fn c = get_basic_cmp(flags, env);
Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/as_environment.h 22 Nov 2007 18:50:56 -0000 1.66
+++ server/as_environment.h 12 Dec 2007 10:07:00 -0000 1.67
@@ -287,14 +287,14 @@
//
/// Local registers are only meaningful within a function2 context.
///
- as_value& local_register(uint8_t n)
+ as_value& local_register(boost::uint8_t n)
{
assert(!_localFrames.empty());
return _localFrames.back().registers[n];
}
/// Set the Nth local register to something
- void set_local_register(uint8_t n, as_value &val)
+ void set_local_register(boost::uint8_t n, as_value &val)
{
if ( ! _localFrames.empty() )
{
@@ -314,7 +314,7 @@
}
/// Set the Nth local register to something
- void set_global_register(uint8_t n, as_value &val) {
+ void set_global_register(boost::uint8_t n, as_value &val) {
if (n <= 4) {
m_global_register[n] = val;
}
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/as_value.cpp 4 Dec 2007 11:45:28 -0000 1.102
+++ server/as_value.cpp 12 Dec 2007 10:07:00 -0000 1.103
@@ -57,7 +57,7 @@
namespace {
struct invalidHexDigit {};
-uint8_t parseHex(char c)
+boost::uint8_t parseHex(char c)
{
switch (c)
{
@@ -381,9 +381,9 @@
if ( s.length() == 8 && s[0] == '0' && ( s[1] == 'x' || s[1] ==
'X' ) )
{
try {
- uint8_t r = (parseHex(s[2])<<4) + parseHex(s[3]);
- uint8_t g = (parseHex(s[4])<<4) + parseHex(s[5]);
- uint8_t b = (parseHex(s[6])<<4) + parseHex(s[7]);
+ boost::uint8_t r = (parseHex(s[2])<<4) + parseHex(s[3]);
+ boost::uint8_t g = (parseHex(s[4])<<4) + parseHex(s[5]);
+ boost::uint8_t b = (parseHex(s[6])<<4) + parseHex(s[7]);
return (double)((r<<16)|(g<<8)|b);
} catch (invalidHexDigit) { }
Index: server/cxform.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/cxform.cpp 1 Dec 2007 00:14:59 -0000 1.6
+++ server/cxform.cpp 12 Dec 2007 10:07:00 -0000 1.7
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: cxform.cpp,v 1.6 2007/12/01 00:14:59 strk Exp $
+// $Id: cxform.cpp,v 1.7 2007/12/12 10:07:00 zoulunkai Exp $
//
#ifdef HAVE_CONFIG_H
@@ -75,13 +75,13 @@
return result;
}
-void cxform::transform(uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) const
+void cxform::transform(boost::uint8_t& r, boost::uint8_t& g, boost::uint8_t&
b, boost::uint8_t& a) const
// Faster transform() method for loops (avoids creation of rgba object)
{
- r = (uint8_t) fclamp(r * m_[0][0] + m_[0][1], 0, 255);
- g = (uint8_t) fclamp(g * m_[1][0] + m_[1][1], 0, 255);
- b = (uint8_t) fclamp(b * m_[2][0] + m_[2][1], 0, 255);
- a = (uint8_t) fclamp(a * m_[3][0] + m_[3][1], 0, 255);
+ r = (boost::uint8_t) fclamp(r * m_[0][0] + m_[0][1], 0, 255);
+ g = (boost::uint8_t) fclamp(g * m_[1][0] + m_[1][1], 0, 255);
+ b = (boost::uint8_t) fclamp(b * m_[2][0] + m_[2][1], 0, 255);
+ a = (boost::uint8_t) fclamp(a * m_[3][0] + m_[3][1], 0, 255);
}
void cxform::read_rgb(stream* in)
Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/fill_style.cpp 4 Dec 2007 22:41:42 -0000 1.15
+++ server/fill_style.cpp 12 Dec 2007 10:07:00 -0000 1.16
@@ -150,7 +150,7 @@
// num_gradients is not 8 bits, it is only the last 4.
// at the moment, the first four are unused, so we may
// mask, but this needs to be changed.
- uint8_t num_gradients = in->read_u8() & 15;
+ boost::uint8_t num_gradients = in->read_u8() & 15;
if ( ! num_gradients )
{
IF_VERBOSE_MALFORMED_SWF(
@@ -323,7 +323,7 @@
}
rgba
-fill_style::sample_gradient(uint8_t ratio) const
+fill_style::sample_gradient(boost::uint8_t ratio) const
{
assert(m_type == SWF::FILL_LINEAR_GRADIENT
|| m_type == SWF::FILL_RADIAL_GRADIENT
@@ -501,7 +501,7 @@
for (size_t j=0, nj=m_gradients.size(); j<nj; ++j)
{
m_gradients[j].m_ratio =
- (uint8_t) frnd(
+ (boost::uint8_t) frnd(
flerp(a.m_gradients[j].m_ratio, b.m_gradients[j].m_ratio, t)
);
m_gradients[j].m_color.set_lerp(a.m_gradients[j].m_color,
b.m_gradients[j].m_color, t);
Index: server/fill_style.h
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/fill_style.h 4 Dec 2007 22:41:42 -0000 1.12
+++ server/fill_style.h 12 Dec 2007 10:07:00 -0000 1.13
@@ -17,7 +17,7 @@
// Based on work of Thatcher Ulrich <address@hidden> 2003
-/* $Id: fill_style.h,v 1.12 2007/12/04 22:41:42 strk Exp $ */
+/* $Id: fill_style.h,v 1.13 2007/12/12 10:07:00 zoulunkai Exp $ */
#ifndef GNASH_FILL_STYLE_H
#define GNASH_FILL_STYLE_H
@@ -43,7 +43,7 @@
void read(stream* in, int tag_type);
//data:
- uint8_t m_ratio;
+ boost::uint8_t m_ratio;
rgba m_color;
};
@@ -150,7 +150,7 @@
/// @param ratio
/// Ratio is in the range [0, 255].
///
- rgba sample_gradient(uint8_t ratio) const;
+ rgba sample_gradient(boost::uint8_t ratio) const;
friend class morph2_character_def;
friend class triangulating_render_handler;
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/font.cpp 4 Dec 2007 11:45:28 -0000 1.52
+++ server/font.cpp 12 Dec 2007 10:07:00 -0000 1.53
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: font.cpp,v 1.52 2007/12/04 11:45:28 strk Exp $ */
+/* $Id: font.cpp,v 1.53 2007/12/12 10:07:00 zoulunkai Exp $ */
// Based on the public domain work of Thatcher Ulrich <address@hidden> 2003
@@ -217,7 +217,7 @@
m_wide_codes = in->read_bit();
m_is_italic = in->read_bit();
m_is_bold = in->read_bit();
- uint8_t reserved = in->read_u8();
+ boost::uint8_t reserved = in->read_u8();
IF_VERBOSE_PARSE (
log_parse(" has_layout = %d", has_layout);
@@ -469,7 +469,7 @@
// Code table is made of bytes.
for (int i=0, n=_embedGlyphTable.size(); i<n; ++i)
{
- uint8_t code = in->read_u8();
+ boost::uint8_t code = in->read_u8();
_embedded_code_table.insert(std::make_pair(code, i));
}
}
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/movie_root.cpp 11 Dec 2007 00:14:23 -0000 1.135
+++ server/movie_root.cpp 12 Dec 2007 10:07:01 -0000 1.136
@@ -1548,7 +1548,7 @@
{
//GNASH_REPORT_FUNCTION;
- uint8_t newAlpha = iclamp(frnd(alpha * 255.0f), 0, 255);
+ boost::uint8_t newAlpha = iclamp(frnd(alpha * 255.0f), 0, 255);
if ( m_background_color.m_a != newAlpha )
{
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -b -r1.410 -r1.411
--- server/sprite_instance.cpp 12 Dec 2007 08:38:16 -0000 1.410
+++ server/sprite_instance.cpp 12 Dec 2007 10:07:01 -0000 1.411
@@ -1226,10 +1226,10 @@
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
boost::uint16_t thickness = 0;
- uint8_t r = 0;
- uint8_t g = 0;
- uint8_t b = 0;
- uint8_t a = 255;
+ boost::uint8_t r = 0;
+ boost::uint8_t g = 0;
+ boost::uint8_t b = 0;
+ boost::uint8_t a = 255;
if ( ! fn.nargs )
@@ -1244,14 +1244,14 @@
{
// 2^24 is the max here
boost::uint32_t rgbval =
boost::uint32_t(fclamp(fn.arg(1).to_number(), 0, 16777216));
- r = uint8_t( (rgbval&0xFF0000) >> 16);
- g = uint8_t( (rgbval&0x00FF00) >> 8);
- b = uint8_t( (rgbval&0x0000FF) );
+ r = boost::uint8_t( (rgbval&0xFF0000) >> 16);
+ g = boost::uint8_t( (rgbval&0x00FF00) >> 8);
+ b = boost::uint8_t( (rgbval&0x0000FF) );
if ( fn.nargs > 2 )
{
float alphaval = fclamp(fn.arg(2).to_number(), 0, 100);
- a = uint8_t( 255 * (alphaval/100) );
+ a = boost::uint8_t( 255 * (alphaval/100) );
}
}
@@ -1311,18 +1311,18 @@
{
boost::intrusive_ptr<sprite_instance> sprite =
ensureType<sprite_instance>(fn.this_ptr);
- uint8_t r = 0;
- uint8_t g = 0;
- uint8_t b = 0;
- uint8_t a = 255;
+ boost::uint8_t r = 0;
+ boost::uint8_t g = 0;
+ boost::uint8_t b = 0;
+ boost::uint8_t a = 255;
if ( fn.nargs > 0 )
{
// 2^24 is the max here
boost::uint32_t rgbval =
boost::uint32_t(fclamp(fn.arg(0).to_number(), 0, 16777216));
- r = uint8_t( (rgbval&0xFF0000) >> 16);
- g = uint8_t( (rgbval&0x00FF00) >> 8);
- b = uint8_t( (rgbval&0x0000FF) );
+ r = boost::uint8_t( (rgbval&0xFF0000) >> 16);
+ g = boost::uint8_t( (rgbval&0x00FF00) >> 8);
+ b = boost::uint8_t( (rgbval&0x0000FF) );
}
Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/stream.cpp 4 Dec 2007 18:35:16 -0000 1.39
+++ server/stream.cpp 12 Dec 2007 10:07:01 -0000 1.40
@@ -226,7 +226,7 @@
#endif
}
-uint8_t stream::read_u8()
+boost::uint8_t stream::read_u8()
{
align();
return m_input->read_byte();
Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/stream.h 5 Dec 2007 11:31:52 -0000 1.37
+++ server/stream.h 12 Dec 2007 10:07:01 -0000 1.38
@@ -145,7 +145,7 @@
//
/// aligned read
///
- uint8_t read_u8();
+ boost::uint8_t read_u8();
/// Read a aligned signed 8-bit value from the stream.
//
@@ -391,8 +391,8 @@
private:
tu_file* m_input;
- uint8_t m_current_byte;
- uint8_t m_unused_bits;
+ boost::uint8_t m_current_byte;
+ boost::uint8_t m_unused_bits;
typedef std::pair<unsigned long,unsigned long> TagBoundaries;
// position of start and end of tag
Index: server/styles.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/styles.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/styles.cpp 10 Sep 2007 04:29:54 -0000 1.35
+++ server/styles.cpp 12 Dec 2007 10:07:01 -0000 1.36
@@ -48,9 +48,9 @@
pOther->m_width = in->read_u16();
// TODO: Same as in read(...), use these.
// 0 -- Round caps, 1 -- No caps, 2 -- square caps
- uint8_t caps = in->read_uint(2);
+ boost::uint8_t caps = in->read_uint(2);
// 0 -- Round join, 1 -- Bevel join, 2 -- Miter join
- uint8_t joins = in->read_uint(2);
+ boost::uint8_t joins = in->read_uint(2);
bool has_fill = in->read_uint(1);
bool no_hscale = in->read_uint(1);
bool no_vscale = in->read_uint(1);
@@ -95,9 +95,9 @@
in->ensureBytes(2);
m_width = in->read_u16();
// 0 -- Round caps, 1 -- No caps, 2 -- square caps
- uint8_t caps = in->read_uint(2);
+ boost::uint8_t caps = in->read_uint(2);
// 0 -- Round join, 1 -- Bevel join, 2 -- Miter join
- uint8_t joins = in->read_uint(2);
+ boost::uint8_t joins = in->read_uint(2);
bool has_fill = in->read_uint(1);
bool no_hscale = in->read_uint(1);
bool no_vscale = in->read_uint(1);
Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/swf_function.cpp 22 Nov 2007 11:09:54 -0000 1.42
+++ server/swf_function.cpp 12 Dec 2007 10:07:01 -0000 1.43
@@ -173,7 +173,7 @@
// Handle the implicit args.
// @@ why start at 1 ? Note that starting at 0 makes
// intro.swf movie fail to play correctly.
- uint8_t current_reg = 1;
+ boost::uint8_t current_reg = 1;
if (m_function2_flags & PRELOAD_THIS)
{
// preload 'this' into a register.
Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/swf_function.h 4 Dec 2007 11:45:29 -0000 1.19
+++ server/swf_function.h 12 Dec 2007 10:07:01 -0000 1.20
@@ -77,7 +77,7 @@
};
std::vector<arg_spec> m_args;
bool m_is_function2;
- uint8_t m_local_register_count;
+ boost::uint8_t m_local_register_count;
/// used by function2 to control implicit arg register assignments
//
@@ -200,7 +200,7 @@
void set_is_function2() { m_is_function2 = true; }
- void set_local_register_count(uint8_t ct) { assert(m_is_function2);
m_local_register_count = ct; }
+ void set_local_register_count(boost::uint8_t ct) {
assert(m_is_function2); m_local_register_count = ct; }
void set_function2_flags(boost::uint16_t flags) {
assert(m_is_function2); m_function2_flags = flags; }
Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/types.cpp 23 Nov 2007 12:36:40 -0000 1.27
+++ server/types.cpp 12 Dec 2007 10:07:01 -0000 1.28
@@ -89,10 +89,10 @@
void rgba::set_lerp(const rgba& a, const rgba& b, float f)
{
- m_r = (uint8_t) frnd(flerp(a.m_r, b.m_r, f));
- m_g = (uint8_t) frnd(flerp(a.m_g, b.m_g, f));
- m_b = (uint8_t) frnd(flerp(a.m_b, b.m_b, f));
- m_a = (uint8_t) frnd(flerp(a.m_a, b.m_a, f));
+ m_r = (boost::uint8_t) frnd(flerp(a.m_r, b.m_r, f));
+ m_g = (boost::uint8_t) frnd(flerp(a.m_g, b.m_g, f));
+ m_b = (boost::uint8_t) frnd(flerp(a.m_b, b.m_b, f));
+ m_a = (boost::uint8_t) frnd(flerp(a.m_a, b.m_a, f));
}
std::ostream&
Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/types.h 4 Dec 2007 11:45:30 -0000 1.18
+++ server/types.h 12 Dec 2007 10:07:01 -0000 1.19
@@ -36,7 +36,7 @@
friend std::ostream& operator<< (std::ostream& os, const rgba&
r);
- uint8_t m_r, m_g, m_b, m_a;
+ boost::uint8_t m_r, m_g, m_b, m_a;
/// Default RGBA value is FF.FF.FF.FF
rgba() : m_r(255), m_g(255), m_b(255), m_a(255) {}
@@ -48,7 +48,7 @@
/// @param b Blue
/// @param a Alpha (transparency)
///
- rgba(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+ rgba(boost::uint8_t r, boost::uint8_t g, boost::uint8_t b,
boost::uint8_t a)
:
m_r(r), m_g(g), m_b(b), m_a(a)
{
@@ -66,9 +66,9 @@
///
void parseRGB(boost::uint32_t rgbCol)
{
- m_r = (uint8_t)(rgbCol>>16);
- m_g = (uint8_t)(rgbCol>>8);
- m_b = (uint8_t)(rgbCol);
+ m_r = (boost::uint8_t)(rgbCol>>16);
+ m_g = (boost::uint8_t)(rgbCol>>8);
+ m_b = (boost::uint8_t)(rgbCol);
}
/// \brief
@@ -112,7 +112,7 @@
void read_rgb(stream* in);
/// Set r,g,b.a values
- void set(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+ void set(boost::uint8_t r, boost::uint8_t g, boost::uint8_t
b, boost::uint8_t a)
{
m_r = r;
m_g = g;
Index: testsuite/FuzzyPixel.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/FuzzyPixel.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/FuzzyPixel.h 1 Jul 2007 10:54:37 -0000 1.6
+++ testsuite/FuzzyPixel.h 12 Dec 2007 10:07:01 -0000 1.7
@@ -95,7 +95,7 @@
/// @param a
/// The alpha value.
///
- FuzzyPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+ FuzzyPixel(boost::uint8_t r, boost::uint8_t g, boost::uint8_t b,
boost::uint8_t a)
:
_col(r, g, b, a),
_tol(0)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash backend/render_handler_agg.cpp backend/re...,
Zou Lunkai <=