[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/server asobj/BevelFilter_as.cpp asobj/Blu...
|
From: |
Zou Lunkai |
|
Subject: |
[Gnash-commit] gnash/server asobj/BevelFilter_as.cpp asobj/Blu... |
|
Date: |
Wed, 12 Dec 2007 10:23:48 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Zou Lunkai <zoulunkai> 07/12/12 10:23:47
Modified files:
server/asobj : BevelFilter_as.cpp BlurFilter_as.cpp
ConvolutionFilter_as.cpp
DropShadowFilter_as.cpp GlowFilter_as.cpp
GradientBevelFilter_as.cpp
GradientGlowFilter_as.cpp Key.cpp Key.h
NetStreamFfmpeg.cpp NetStreamFfmpeg.h
NetStreamGst.cpp SoundFfmpeg.cpp SoundFfmpeg.h
SoundGst.h SoundMad.cpp SoundMad.h
server/parser : abc_block.cpp abc_block.h action_buffer.cpp
action_buffer.h filter_factory.cpp
shape_character_def.cpp video_stream_def.cpp
video_stream_def.h
server/swf : PlaceObject2Tag.cpp tag_loaders.cpp
server/vm : ASHandlers.cpp ASHandlers.h ActionExec.cpp
ActionExec.h CodeStream.h Machine.cpp asName.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/server/asobj/BevelFilter_as.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/BlurFilter_as.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ConvolutionFilter_as.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/DropShadowFilter_as.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GlowFilter_as.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientBevelFilter_as.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/GradientGlowFilter_as.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/abc_block.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/filter_factory.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/video_stream_def.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.163&r2=1.164
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.169&r2=1.170
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/CodeStream.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Machine.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/asName.h?cvsroot=gnash&r1=1.1&r2=1.2
Patches:
Index: asobj/BevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BevelFilter_as.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- asobj/BevelFilter_as.cpp 4 Dec 2007 11:45:30 -0000 1.5
+++ asobj/BevelFilter_as.cpp 12 Dec 2007 10:23:45 -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: BevelFilter_as.cpp,v 1.5 2007/12/04 11:45:30 strk Exp $ */
+/* $Id: BevelFilter_as.cpp,v 1.6 2007/12/12 10:23:45 zoulunkai Exp $ */
#include "as_object.h"
#include "BevelFilter.h"
@@ -77,13 +77,13 @@
phelp_property(float, number<float>, distance)
phelp_property(float, number<float>, angle)
phelp_property(boost::uint32_t, number<boost::uint32_t>, highlightColor)
-phelp_property(uint8_t, number<uint8_t>, highlightAlpha)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, highlightAlpha)
phelp_property(boost::uint32_t, number<boost::uint32_t>, shadowColor)
-phelp_property(uint8_t, number<uint8_t>, shadowAlpha)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, shadowAlpha)
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
phelp_property(float, number<float>, strength)
-phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, quality)
phelp_property(bool, bool, knockout)
easy_clone(BevelFilter_as)
Index: asobj/BlurFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/BlurFilter_as.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- asobj/BlurFilter_as.cpp 14 Sep 2007 01:26:40 -0000 1.3
+++ asobj/BlurFilter_as.cpp 12 Dec 2007 10:23:45 -0000 1.4
@@ -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_as.cpp,v 1.3 2007/09/14 01:26:40 nihilus Exp $ */
+/* $Id: BlurFilter_as.cpp,v 1.4 2007/12/12 10:23:45 zoulunkai Exp $ */
#include "as_object.h"
#include "BlurFilter.h"
@@ -56,7 +56,7 @@
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
-phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, quality)
easy_clone(BlurFilter_as)
Index: asobj/ConvolutionFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ConvolutionFilter_as.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- asobj/ConvolutionFilter_as.cpp 4 Dec 2007 11:45:30 -0000 1.4
+++ asobj/ConvolutionFilter_as.cpp 12 Dec 2007 10:23:45 -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: ConvolutionFilter_as.cpp,v 1.4 2007/12/04 11:45:30 strk Exp $ */
+/* $Id: ConvolutionFilter_as.cpp,v 1.5 2007/12/12 10:23:45 zoulunkai Exp $ */
#include "as_object.h"
#include "ConvolutionFilter.h"
@@ -65,14 +65,14 @@
phelp_gs_attach(alpha);
phelp_gs_attach_end
-phelp_property(uint8_t, number<uint8_t>, matrixX)
-phelp_property(uint8_t, number<uint8_t>, matrixY)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, matrixX)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, matrixY)
phelp_property(float, number<float>, divisor)
phelp_property(float, number<float>, bias)
phelp_property(bool, bool, preserveAlpha)
phelp_property(bool, bool, clamp)
phelp_property(boost::uint32_t, number<boost::uint32_t>, color)
-phelp_property(uint8_t, number<uint8_t>, alpha)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, alpha)
phelp_array_property(matrix)
easy_clone(ConvolutionFilter_as)
Index: asobj/DropShadowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/DropShadowFilter_as.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- asobj/DropShadowFilter_as.cpp 4 Dec 2007 11:45:30 -0000 1.4
+++ asobj/DropShadowFilter_as.cpp 12 Dec 2007 10:23:45 -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: DropShadowFilter_as.cpp,v 1.4 2007/12/04 11:45:30 strk Exp $ */
+/* $Id: DropShadowFilter_as.cpp,v 1.5 2007/12/12 10:23:45 zoulunkai Exp $ */
#include "as_object.h"
#include "DropShadowFilter.h"
@@ -75,11 +75,11 @@
phelp_property(float, number<float>, distance)
phelp_property(float, number<float>, angle)
phelp_property(boost::uint32_t, number<boost::uint32_t>, color)
-phelp_property(uint8_t, number<uint8_t>, alpha)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, alpha)
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
phelp_property(float, number<float>, strength)
-phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, quality)
phelp_property(bool, bool, inner)
phelp_property(bool, bool, knockout)
phelp_property(bool, bool, hideObject)
Index: asobj/GlowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GlowFilter_as.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- asobj/GlowFilter_as.cpp 4 Dec 2007 11:45:31 -0000 1.4
+++ asobj/GlowFilter_as.cpp 12 Dec 2007 10:23:46 -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: GlowFilter_as.cpp,v 1.4 2007/12/04 11:45:31 strk Exp $ */
+/* $Id: GlowFilter_as.cpp,v 1.5 2007/12/12 10:23:46 zoulunkai Exp $ */
#include "as_object.h"
#include "GlowFilter.h"
@@ -66,11 +66,11 @@
phelp_gs_attach_end
phelp_property(boost::uint32_t, number<boost::uint32_t>, color)
-phelp_property(uint8_t, number<uint8_t>, alpha)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, alpha)
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
phelp_property(float, number<float>, strength)
-phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, quality)
phelp_property(bool, bool, inner)
phelp_property(bool, bool, knockout)
Index: asobj/GradientBevelFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GradientBevelFilter_as.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- asobj/GradientBevelFilter_as.cpp 14 Sep 2007 01:39:31 -0000 1.3
+++ asobj/GradientBevelFilter_as.cpp 12 Dec 2007 10:23:46 -0000 1.4
@@ -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_as.cpp,v 1.3 2007/09/14 01:39:31 nihilus Exp $ */
+/* $Id: GradientBevelFilter_as.cpp,v 1.4 2007/12/12 10:23:46 zoulunkai Exp $ */
#include "as_object.h"
#include "GradientBevelFilter.h"
@@ -82,7 +82,7 @@
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
phelp_property(float, number<float>, strength)
-phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, quality)
// Type is not automatable.
phelp_property(bool, bool, knockout)
Index: asobj/GradientGlowFilter_as.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/GradientGlowFilter_as.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- asobj/GradientGlowFilter_as.cpp 14 Sep 2007 01:39:31 -0000 1.3
+++ asobj/GradientGlowFilter_as.cpp 12 Dec 2007 10:23:46 -0000 1.4
@@ -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_as.cpp,v 1.3 2007/09/14 01:39:31 nihilus Exp $ */
+/* $Id: GradientGlowFilter_as.cpp,v 1.4 2007/12/12 10:23:46 zoulunkai Exp $ */
#include "as_object.h"
#include "GradientGlowFilter.h"
@@ -82,7 +82,7 @@
phelp_property(float, number<float>, blurX)
phelp_property(float, number<float>, blurY)
phelp_property(float, number<float>, strength)
-phelp_property(uint8_t, number<uint8_t>, quality)
+phelp_property(boost::uint8_t, number<boost::uint8_t>, quality)
// Type is not automatable.
phelp_property(bool, bool, knockout)
Index: asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- asobj/Key.cpp 28 Nov 2007 12:47:04 -0000 1.48
+++ asobj/Key.cpp 12 Dec 2007 10:23:46 -0000 1.49
@@ -67,7 +67,7 @@
// Find bit within the byte:
int bit_index = keycode - (byte_index << 3);
- uint8_t mask = 1 << bit_index;
+ boost::uint8_t mask = 1 << bit_index;
if ((m_unreleased_keys[byte_index] & mask) != 0 ) return true;
Index: asobj/Key.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- asobj/Key.h 16 Nov 2007 17:35:34 -0000 1.31
+++ asobj/Key.h 12 Dec 2007 10:23:46 -0000 1.32
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: Key.h,v 1.31 2007/11/16 17:35:34 strk Exp $ */
+/* $Id: Key.h,v 1.32 2007/12/12 10:23:46 zoulunkai Exp $ */
#ifndef __KEY_H__
#define __KEY_H__
@@ -51,7 +51,7 @@
private:
/// bit-array for recording the unreleased keys
- uint8_t m_unreleased_keys[key::KEYCOUNT / 8 + 1];
+ boost::uint8_t m_unreleased_keys[key::KEYCOUNT / 8 + 1];
typedef std::list<boost::intrusive_ptr<as_object> > Listeners;
Listeners m_listeners;
Index: asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- asobj/NetStreamFfmpeg.cpp 4 Dec 2007 11:45:31 -0000 1.101
+++ asobj/NetStreamFfmpeg.cpp 12 Dec 2007 10:23:46 -0000 1.102
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamFfmpeg.cpp,v 1.101 2007/12/04 11:45:31 strk Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.102 2007/12/12 10:23:46 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -185,7 +185,7 @@
// ffmpeg callback function
int
-NetStreamFfmpeg::readPacket(void* opaque, uint8_t* buf, int buf_size)
+NetStreamFfmpeg::readPacket(void* opaque, boost::uint8_t* buf, int buf_size)
{
NetStreamFfmpeg* ns = static_cast<NetStreamFfmpeg*>(opaque);
@@ -384,7 +384,7 @@
static AVInputFormat*
probeStream(NetStreamFfmpeg* ns)
{
- boost::scoped_array<uint8_t> buffer(new uint8_t[2048]);
+ boost::scoped_array<boost::uint8_t> buffer(new boost::uint8_t[2048]);
// Probe the file to detect the format
AVProbeData probe_data;
@@ -493,7 +493,7 @@
// Setup the filereader/seeker mechanism. 7th argument (NULL) is the
writer function,
// which isn't needed.
- init_put_byte(&ByteIOCxt, new uint8_t[500000], 500000, 0, this,
NetStreamFfmpeg::readPacket, NULL, NetStreamFfmpeg::seekMedia);
+ init_put_byte(&ByteIOCxt, new boost::uint8_t[500000], 500000, 0, this,
NetStreamFfmpeg::readPacket, NULL, NetStreamFfmpeg::seekMedia);
ByteIOCxt.is_streamed = 1;
m_FormatCtx = av_alloc_format_context();
@@ -631,10 +631,10 @@
dst->update(src->m_data);
#if 0
- uint8_t* dstptr = dst->m_data;
+ boost::uint8_t* dstptr = dst->m_data;
- uint8_t* srcptr = src->m_data;
- uint8_t* srcend = src->m_data + src->m_size;
+ boost::uint8_t* srcptr = src->m_data;
+ boost::uint8_t* srcend = src->m_data + src->m_size;
while (srcptr < srcend) {
memcpy(dstptr, srcptr, width);
@@ -733,7 +733,7 @@
}
// audio callback is running in sound handler thread
-bool NetStreamFfmpeg::audio_streamer(void *owner, uint8_t *stream, int len)
+bool NetStreamFfmpeg::audio_streamer(void *owner, boost::uint8_t *stream, int
len)
{
//GNASH_REPORT_FUNCTION;
@@ -826,7 +826,7 @@
int frame_size;
unsigned int bufsize = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
- uint8_t* ptr = new uint8_t[bufsize];
+ boost::uint8_t* ptr = new boost::uint8_t[bufsize];
#ifdef FFMPEG_AUDIO2
frame_size = bufsize;
if (avcodec_decode_audio2(m_ACodecCtx, (boost::int16_t*) ptr,
&frame_size, packet->data, packet->size) >= 0)
@@ -842,13 +842,13 @@
{
// Resampling is needed.
- uint8_t* output = new uint8_t[bufsize];
+ boost::uint8_t* output = new boost::uint8_t[bufsize];
samples =
_resampler.resample(reinterpret_cast<boost::int16_t*>(ptr),
reinterpret_cast<boost::int16_t*>(output),
samples);
delete [] ptr;
- ptr = reinterpret_cast<uint8_t*>(output);
+ ptr = reinterpret_cast<boost::uint8_t*>(output);
}
raw_mediadata_t* raw = new raw_mediadata_t();
@@ -902,7 +902,7 @@
avcodec_decode_video(m_VCodecCtx, m_Frame, &got, packet->data,
packet->size);
if (got)
{
- boost::scoped_array<uint8_t> buffer;
+ boost::scoped_array<boost::uint8_t> buffer;
if (m_imageframe == NULL)
{
@@ -938,12 +938,12 @@
if (m_videoFrameFormat == render::YUV)
{
- video->m_data = new
uint8_t[static_cast<image::yuv*>(m_imageframe)->size()];
+ video->m_data = new
boost::uint8_t[static_cast<image::yuv*>(m_imageframe)->size()];
}
else if (m_videoFrameFormat == render::RGB)
{
image::rgb* tmp =
static_cast<image::rgb*>(m_imageframe);
- video->m_data = new uint8_t[m_imageframe->size()]; //
tmp->m_pitch * tmp->m_height];
+ video->m_data = new
boost::uint8_t[m_imageframe->size()]; // tmp->m_pitch * tmp->m_height];
}
video->m_ptr = video->m_data;
@@ -981,11 +981,11 @@
{
image::yuv* yuvframe =
static_cast<image::yuv*>(m_imageframe);
int copied = 0;
- uint8_t* ptr = video->m_data;
+ boost::uint8_t* ptr = video->m_data;
for (int i = 0; i < 3 ; i++)
{
int shift = (i == 0 ? 0 : 1);
- uint8_t* yuv_factor = m_Frame->data[i];
+ boost::uint8_t* yuv_factor = m_Frame->data[i];
int h = m_VCodecCtx->height >> shift;
int w = m_VCodecCtx->width >> shift;
for (int j = 0; j < h; j++)
@@ -1002,9 +1002,9 @@
else if (m_videoFrameFormat == render::RGB)
{
- uint8_t* srcptr = m_Frame->data[0];
- uint8_t* srcend = m_Frame->data[0] +
m_Frame->linesize[0] * m_VCodecCtx->height;
- uint8_t* dstptr = video->m_data;
+ boost::uint8_t* srcptr = m_Frame->data[0];
+ boost::uint8_t* srcend = m_Frame->data[0] +
m_Frame->linesize[0] * m_VCodecCtx->height;
+ boost::uint8_t* dstptr = video->m_data;
unsigned int srcwidth = m_VCodecCtx->width * 3;
video->m_size = 0;
Index: asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- asobj/NetStreamFfmpeg.h 4 Dec 2007 11:45:31 -0000 1.54
+++ asobj/NetStreamFfmpeg.h 12 Dec 2007 10:23:46 -0000 1.55
@@ -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: NetStreamFfmpeg.h,v 1.54 2007/12/04 11:45:31 strk Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.55 2007/12/12 10:23:46 zoulunkai Exp $ */
#ifndef __NETSTREAMFFMPEG_H__
#define __NETSTREAMFFMPEG_H__
@@ -70,8 +70,8 @@
int m_stream_index;
boost::uint32_t m_size;
- uint8_t* m_data;
- uint8_t* m_ptr;
+ boost::uint8_t* m_data;
+ boost::uint8_t* m_ptr;
boost::uint32_t m_pts; // presentation timestamp in millisec
};
@@ -268,7 +268,7 @@
void advance();
// Used for ffmpeg data read and seek callbacks with non-FLV
- static int readPacket(void* opaque, uint8_t* buf, int buf_size);
+ static int readPacket(void* opaque, boost::uint8_t* buf, int buf_size);
// Used for ffmpeg data read and seek callbacks with non-FLV
static offset_t seekMedia(void *opaque, offset_t offset, int whence);
@@ -282,7 +282,7 @@
///
/// It will be invoked by a separate thread (neither main, nor decoder
thread).
///
- static bool audio_streamer(void *udata, uint8_t *stream, int len);
+ static bool audio_streamer(void *udata, boost::uint8_t *stream, int
len);
private:
Index: asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- asobj/NetStreamGst.cpp 4 Dec 2007 11:45:31 -0000 1.63
+++ asobj/NetStreamGst.cpp 12 Dec 2007 10:23:46 -0000 1.64
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: NetStreamGst.cpp,v 1.63 2007/12/04 11:45:31 strk Exp $ */
+/* $Id: NetStreamGst.cpp,v 1.64 2007/12/12 10:23:46 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -303,11 +303,11 @@
/* image::yuv* yuvframe =
static_cast<image::yuv*>(m_imageframe);
int copied = 0;
- uint8_t* ptr = GST_BUFFER_DATA(buffer);
+ boost::uint8_t* ptr = GST_BUFFER_DATA(buffer);
for (int i = 0; i < 3 ; i++)
{
int shift = (i == 0 ? 0 : 1);
- uint8_t* yuv_factor = m_Frame->data[i];
+ boost::uint8_t* yuv_factor = m_Frame->data[i];
int h = ns->videoheight >> shift;
int w = ns->videowidth >> shift;
for (int j = 0; j < h; j++)
@@ -917,7 +917,7 @@
inputPos = 0;
- uint8_t head[3];
+ boost::uint8_t head[3];
if (nc->read(head, 3) < 3) {
setStatus(streamNotFound);
return;
Index: asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- asobj/SoundFfmpeg.cpp 4 Dec 2007 11:45:31 -0000 1.18
+++ asobj/SoundFfmpeg.cpp 12 Dec 2007 10:23:46 -0000 1.19
@@ -36,7 +36,7 @@
// ffmpeg callback function
int
-SoundFfmpeg::readPacket(void* opaque, uint8_t* buf, int buf_size)
+SoundFfmpeg::readPacket(void* opaque, boost::uint8_t* buf, int buf_size)
{
SoundFfmpeg* so = static_cast<SoundFfmpeg*>(opaque);
@@ -111,7 +111,7 @@
// Probe the file to detect the format
AVProbeData probe_data, *pd = &probe_data;
pd->filename = "";
- pd->buf = new uint8_t[2048];
+ pd->buf = new boost::uint8_t[2048];
pd->buf_size = 2048;
if (readPacket(so, pd->buf, pd->buf_size) < 1){
@@ -131,7 +131,7 @@
// Setup the filereader/seeker mechanism. 7th argument (NULL) is the
writer function,
// which isn't needed.
- init_put_byte(&so->ByteIOCxt, new uint8_t[500000], 500000, 0, so,
SoundFfmpeg::readPacket, NULL, SoundFfmpeg::seekMedia);
+ init_put_byte(&so->ByteIOCxt, new boost::uint8_t[500000], 500000, 0,
so, SoundFfmpeg::readPacket, NULL, SoundFfmpeg::seekMedia);
so->ByteIOCxt.is_streamed = 1;
so->formatCtx = av_alloc_format_context();
@@ -222,7 +222,7 @@
}
// audio callback is running in sound handler thread
-bool SoundFfmpeg::getAudio(void* owner, uint8_t* stream, int len)
+bool SoundFfmpeg::getAudio(void* owner, boost::uint8_t* stream, int len)
{
SoundFfmpeg* so = static_cast<SoundFfmpeg*>(owner);
@@ -240,7 +240,7 @@
delete[] so->leftOverData;
so->leftOverSize = 0;
} else {
- uint8_t* buf = new uint8_t[rest];
+ boost::uint8_t* buf = new boost::uint8_t[rest];
memcpy(stream, so->leftOverData+len, rest);
delete[] so->leftOverData;
so->leftOverData = buf;
@@ -258,7 +258,7 @@
AVPacket packet;
int rc;
bool loop = true;
- uint8_t* ptr = new uint8_t[AVCODEC_MAX_AUDIO_FRAME_SIZE];
+ boost::uint8_t* ptr = new boost::uint8_t[AVCODEC_MAX_AUDIO_FRAME_SIZE];
bool ret = true;
while (loop) {
// Parse file
@@ -307,16 +307,16 @@
// If the decoded data isn't
enough to fill the buffer, we put the decoded
// data into the buffer, and
continues decoding.
if (newDataSize <= len-pos) {
- memcpy(stream+pos,
(uint8_t*)output_data, newDataSize);
+ memcpy(stream+pos,
(boost::uint8_t*)output_data, newDataSize);
pos += newDataSize;
} else {
// If we can fill the buffer,
and still have "leftovers", we save them
// and use them later.
int rest = len-pos;
so->leftOverSize =
newDataSize - rest;
- memcpy(stream+pos,
(uint8_t*)output_data, rest);
- so->leftOverData = new
uint8_t[so->leftOverSize];
-
memcpy(so->leftOverData, ((uint8_t*)output_data)+rest, so->leftOverSize);
+ memcpy(stream+pos,
(boost::uint8_t*)output_data, rest);
+ so->leftOverData = new
boost::uint8_t[so->leftOverSize];
+
memcpy(so->leftOverData, ((boost::uint8_t*)output_data)+rest, so->leftOverSize);
loop = false;
pos += rest;
}
Index: asobj/SoundFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- asobj/SoundFfmpeg.h 12 Nov 2007 16:17:02 -0000 1.10
+++ asobj/SoundFfmpeg.h 12 Dec 2007 10:23:46 -0000 1.11
@@ -77,13 +77,13 @@
unsigned int getPosition();
// Used for ffmpeg data read and seek callbacks
- static int readPacket(void* opaque, uint8_t* buf, int buf_size);
+ static int readPacket(void* opaque, boost::uint8_t* buf, int buf_size);
static offset_t seekMedia(void *opaque, offset_t offset, int whence);
private:
void setupDecoder();
- static bool getAudio(void *owner, uint8_t *stream, int len);
+ static bool getAudio(void *owner, boost::uint8_t *stream, int len);
// audio
AVCodecContext *audioCodecCtx;
@@ -111,7 +111,7 @@
int audioIndex;
// If the decoded data doesn't fit the buffer we put the leftovers here
- uint8_t* leftOverData;
+ boost::uint8_t* leftOverData;
int leftOverSize;
// Are this sound attached to the soundhandler?
Index: asobj/SoundGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- asobj/SoundGst.h 27 Jul 2007 15:09:41 -0000 1.5
+++ asobj/SoundGst.h 12 Dec 2007 10:23:46 -0000 1.6
@@ -67,7 +67,7 @@
static int seekMedia(void *opaque, int offset, int whence);
static void setupDecoder(SoundGst* so);
- static bool getAudio(void *owner, uint8_t *stream, int len);
+ static bool getAudio(void *owner, boost::uint8_t *stream, int len);
static void callback_newpad (GstElement *decodebin, GstPad *pad,
gboolean last, gpointer data);
private:
Index: asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- asobj/SoundMad.cpp 4 Dec 2007 11:45:31 -0000 1.14
+++ asobj/SoundMad.cpp 12 Dec 2007 10:23:46 -0000 1.15
@@ -36,7 +36,7 @@
namespace gnash {
int
-SoundMad::readPacket(uint8_t* buf, int buf_size)
+SoundMad::readPacket(boost::uint8_t* buf, int buf_size)
{
size_t ret = connection->read(static_cast<void*>(buf), buf_size);
@@ -97,7 +97,7 @@
// Fetch data from the file
so->seekMedia(0, SEEK_SET);
- uint8_t* buf = new uint8_t[1024];
+ boost::uint8_t* buf = new boost::uint8_t[1024];
int bufSize = so->readPacket(buf, 1024);
// Setup the mad decoder
@@ -134,7 +134,7 @@
}
// audio callback is running in sound handler thread
-bool SoundMad::getAudio(void* owner, uint8_t* stream, int len)
+bool SoundMad::getAudio(void* owner, boost::uint8_t* stream, int len)
{
SoundMad* so = static_cast<SoundMad*>(owner);
@@ -152,7 +152,7 @@
delete[] so->leftOverData;
so->leftOverSize = 0;
} else {
- uint8_t* buf = new uint8_t[rest];
+ boost::uint8_t* buf = new boost::uint8_t[rest];
memcpy(stream, so->leftOverData+len, rest);
delete[] so->leftOverData;
so->leftOverData = buf;
@@ -167,19 +167,19 @@
}
}
- uint8_t* buf = new uint8_t[8192];
+ boost::uint8_t* buf = new boost::uint8_t[8192];
int bufSize = so->readPacket(buf, 8192);
int orgBufSize = bufSize;
bool loop = true;
- uint8_t* ptr = new uint8_t[8192];
+ boost::uint8_t* ptr = new boost::uint8_t[8192];
bool ret = true;
media::sound_handler* s = get_sound_handler();
if (bufSize > 0) {
if (s) {
// temp raw buffer
- uint8_t* tmp_raw_buffer;
+ boost::uint8_t* tmp_raw_buffer;
unsigned int tmp_raw_buffer_size;
int outsize = 0;
while (loop) {
@@ -226,7 +226,7 @@
outsize = so->synth.pcm.length *
((so->frame.header.mode) ? 4 : 2);
- tmp_raw_buffer = new uint8_t[outsize];
+ tmp_raw_buffer = new boost::uint8_t[outsize];
int sample;
boost::int16_t* dst =
reinterpret_cast<boost::int16_t*>(tmp_raw_buffer);
@@ -275,7 +275,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 {
@@ -297,7 +297,7 @@
int rest = len-pos;
so->leftOverSize = tmp_raw_buffer_size
- rest;
memcpy(stream+pos, tmp_raw_buffer,
rest);
- so->leftOverData = new
uint8_t[so->leftOverSize];
+ so->leftOverData = new
boost::uint8_t[so->leftOverSize];
memcpy(so->leftOverData,
(tmp_raw_buffer)+rest, so->leftOverSize);
loop = false;
pos += rest;
Index: asobj/SoundMad.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- asobj/SoundMad.h 27 Jul 2007 15:09:41 -0000 1.5
+++ asobj/SoundMad.h 12 Dec 2007 10:23:46 -0000 1.6
@@ -60,7 +60,7 @@
unsigned int getPosition();
static void setupDecoder(SoundMad* so);
- static bool getAudio(void *owner, uint8_t *stream, int len);
+ static bool getAudio(void *owner, boost::uint8_t *stream, int len);
private:
long inputPos;
@@ -72,7 +72,7 @@
// bitrate in bps
unsigned long bitrate;
- int readPacket(uint8_t* buf, int buf_size);
+ int readPacket(boost::uint8_t* buf, int buf_size);
int seekMedia(int offset, int whence);
/// mad stuff
@@ -81,7 +81,7 @@
mad_synth synth;
// If the decoded data doesn't fit the buffer we put the leftovers here
- uint8_t* leftOverData;
+ boost::uint8_t* leftOverData;
int leftOverSize;
// Are this sound attached to the soundhandler?
Index: parser/abc_block.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- parser/abc_block.cpp 4 Dec 2007 11:45:32 -0000 1.9
+++ parser/abc_block.cpp 12 Dec 2007 10:23:46 -0000 1.10
@@ -175,7 +175,7 @@
mName = pBlock->mMultinamePool[name].getName();
mNamespace = pBlock->mMultinamePool[name].getNamespace();
- uint8_t kind = in->read_u8();
+ boost::uint8_t kind = in->read_u8();
mKind = static_cast<kinds> (kind & 0x0F);
switch (mKind)
@@ -394,7 +394,7 @@
}
for (unsigned int i = 1; i < count; ++i)
{
- uint8_t kind = mS->read_u8();
+ boost::uint8_t kind = mS->read_u8();
boost::uint32_t nameIndex = mS->read_V32();
if (nameIndex && nameIndex < mStringPool.size())
@@ -471,7 +471,7 @@
}
for (unsigned int i = 1; i < count; ++i)
{
- uint8_t kind = mS->read_u8();
+ boost::uint8_t kind = mS->read_u8();
boost::uint32_t ns = 0;
boost::uint32_t name = 0;
boost::uint32_t nsset = 0;
@@ -583,7 +583,7 @@
}
bool
-abc_block::pool_value(boost::uint32_t index, uint8_t type, as_value &v)
+abc_block::pool_value(boost::uint32_t index, boost::uint8_t type, as_value &v)
{
if (!index)
return true;
@@ -717,7 +717,7 @@
// A skippable name index.
mS->skip_V32();
- uint8_t flags = mS->read_u8();
+ boost::uint8_t flags = mS->read_u8();
// If there are default parameters, read them now.
// Runtime will do validation of whether or not these can
actually
@@ -729,7 +729,7 @@
for (unsigned int j = 0; j < ocount; ++j)
{
boost::uint32_t index = mS->read_V32();
- uint8_t kindof = mS->read_u8();
+ boost::uint8_t kindof = mS->read_u8();
as_value v;
if (!pool_value(index, kindof, v))
return false; // message done by
pool_value
@@ -856,7 +856,7 @@
pSuper->setInherited();
}
- uint8_t flags = mS->read_u8();
+ boost::uint8_t flags = mS->read_u8();
if (flags & INSTANCE_SEALED)
pClass->setSealed();
Index: parser/abc_block.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/abc_block.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- parser/abc_block.h 4 Dec 2007 11:45:32 -0000 1.7
+++ parser/abc_block.h 12 Dec 2007 10:23:46 -0000 1.8
@@ -175,7 +175,7 @@
bool read(stream* in);
- bool pool_value(boost::uint32_t index, uint8_t type, as_value &v);
+ bool pool_value(boost::uint32_t index, boost::uint8_t type, as_value
&v);
abc_block();
};
Index: parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- parser/action_buffer.cpp 4 Dec 2007 11:45:32 -0000 1.28
+++ parser/action_buffer.cpp 12 Dec 2007 10:23:46 -0000 1.29
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: action_buffer.cpp,v 1.28 2007/12/04 11:45:32 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.29 2007/12/12 10:23:46 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -115,7 +115,7 @@
size_t pc = m_buffer.size();
#endif
- uint8_t action_id = in->read_u8();
+ boost::uint8_t action_id = in->read_u8();
m_buffer.push_back(action_id);
if (action_id & 0x80) {
@@ -124,7 +124,7 @@
m_buffer.push_back(length & 0x0FF);
m_buffer.push_back((length >> 8) & 0x0FF);
for (boost::uint16_t i = 0; i < length; i++) {
- uint8_t b = in->read_u8(); // bytes ensured outside loop
+ boost::uint8_t b = in->read_u8(); // bytes ensured outside loop
m_buffer.push_back(b);
}
}
@@ -508,10 +508,10 @@
boost::uint16_t s1;
} s;
struct { // for byte-swapping
- uint8_t c0;
- uint8_t c1;
- uint8_t c2;
- uint8_t c3;
+ boost::uint8_t c0;
+ boost::uint8_t c1;
+ boost::uint8_t c2;
+ boost::uint8_t c3;
} c;
} u;
@@ -522,7 +522,7 @@
break;
case 0x3f80: // big-endian host
{
- const uint8_t *cp = (const uint8_t *) p;
+ const boost::uint8_t *cp = (const boost::uint8_t *) p;
u.c.c0 = cp[3];
u.c.c1 = cp[2];
u.c.c2 = cp[1];
@@ -543,7 +543,7 @@
static double
convert_double_wacky(const void *p)
{
- const uint8_t *cp = (const uint8_t *)p; // Handy uchar version
+ const boost::uint8_t *cp = (const boost::uint8_t *)p; // Handy uchar
version
union {
double d;
boost::uint64_t i;
@@ -558,14 +558,14 @@
boost::uint16_t s3;
} s;
struct {
- uint8_t c0;
- uint8_t c1;
- uint8_t c2;
- uint8_t c3;
- uint8_t c4;
- uint8_t c5;
- uint8_t c6;
- uint8_t c7;
+ boost::uint8_t c0;
+ boost::uint8_t c1;
+ boost::uint8_t c2;
+ boost::uint8_t c3;
+ boost::uint8_t c4;
+ boost::uint8_t c5;
+ boost::uint8_t c6;
+ boost::uint8_t c7;
} c;
} u;
Index: parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- parser/action_buffer.h 4 Dec 2007 11:45:32 -0000 1.22
+++ parser/action_buffer.h 12 Dec 2007 10:23:46 -0000 1.23
@@ -27,7 +27,7 @@
#include "types.h"
//#include <cwchar>
-#include <boost/cstdint.hpp> // for uint8_t
+#include <boost/cstdint.hpp> // for boost::uint8_t
#include <vector> // for composition
#include "smart_ptr.h"
@@ -77,7 +77,7 @@
size_t size() const { return m_buffer.size(); }
- uint8_t operator[] (size_t off) const
+ boost::uint8_t operator[] (size_t off) const
{
assert(off < m_buffer.size() );
return m_buffer[off];
@@ -97,8 +97,8 @@
}
/// Get a variable length 32-bit integer from the stream.
- /// Store its length in the passed uint8_t.
- boost::uint32_t read_V32(size_t pc, uint8_t& length) const
+ /// Store its length in the passed boost::uint8_t.
+ boost::uint32_t read_V32(size_t pc, boost::uint8_t& length) const
{
boost::uint32_t res = m_buffer[pc];
if (!(res & 0x00000080))
@@ -237,7 +237,7 @@
action_buffer(const action_buffer& /*a*/) { abort(); }
/// the code itself, as read from the SWF
- std::vector<uint8_t> m_buffer;
+ std::vector<boost::uint8_t> m_buffer;
/// The dictionary
mutable std::vector<const char*> m_dictionary;
Index: parser/filter_factory.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/filter_factory.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- parser/filter_factory.cpp 29 Aug 2007 03:32:59 -0000 1.5
+++ parser/filter_factory.cpp 12 Dec 2007 10:23:47 -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: filter_factory.cpp,v 1.5 2007/08/29 03:32:59 cmusick Exp $ */
+/* $Id: filter_factory.cpp,v 1.6 2007/12/12 10:23:47 zoulunkai Exp $ */
#include "filter_factory.h"
#include "BitmapFilter.h"
@@ -137,7 +137,7 @@
m_blurX = in->read_ufixed();
m_blurY = in->read_ufixed();
- m_quality = static_cast<uint8_t> (in->read_uint(5));
+ m_quality = static_cast<boost::uint8_t> (in->read_uint(5));
static_cast<void> (in->read_uint(3)); // Throw these away.
@@ -196,7 +196,7 @@
bool GradientGlowFilter::read(stream* in)
{
- uint8_t count = in->read_u8(); // How many colorings.
+ boost::uint8_t count = in->read_u8(); // How many colorings.
m_colors.reserve(count);
m_alphas.reserve(count);
@@ -227,7 +227,7 @@
m_type = outer ? (inner ? FULL_GLOW : OUTER_GLOW) : INNER_GLOW;
- m_quality = static_cast<uint8_t> (in->read_uint(4));
+ m_quality = static_cast<boost::uint8_t> (in->read_uint(4));
return true;
}
@@ -270,7 +270,7 @@
bool GradientBevelFilter::read(stream* in)
{
- uint8_t count = in->read_u8(); // How many colorings.
+ boost::uint8_t count = in->read_u8(); // How many colorings.
m_colors.reserve(count);
m_alphas.reserve(count);
@@ -301,7 +301,7 @@
m_type = outer ? (inner ? FULL_BEVEL : OUTER_BEVEL) : INNER_BEVEL;
- m_quality = static_cast<uint8_t> (in->read_uint(4));
+ m_quality = static_cast<boost::uint8_t> (in->read_uint(4));
return true;
}
Index: parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- parser/shape_character_def.cpp 11 Dec 2007 09:10:24 -0000 1.58
+++ parser/shape_character_def.cpp 12 Dec 2007 10:23:47 -0000 1.59
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: shape_character_def.cpp,v 1.58 2007/12/11 09:10:24 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.59 2007/12/12 10:23:47 zoulunkai Exp $ */
// Based on the public domain shape.cpp of Thatcher Ulrich <address@hidden>
2003
@@ -194,7 +194,7 @@
{
rect tbound;
tbound.read(in);
- /*uint8_t scales =*/static_cast<void>(in->read_u8());
+ /*boost::uint8_t scales =*/static_cast<void>(in->read_u8());
}
read_fill_styles(m_fill_styles, in, tag_type, m);
@@ -216,7 +216,7 @@
//log_msg("Read %u fill styles, %u line styles", m_fill_styles.size(),
m_line_styles.size());
// Use read_u8 to force alignment.
- uint8_t num_bits = in->read_u8();
+ boost::uint8_t num_bits = in->read_u8();
int num_fill_bits = (num_bits & 0xF0) >> 4;
int num_line_bits = (num_bits & 0x0F);
Index: parser/video_stream_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- parser/video_stream_def.cpp 4 Dec 2007 21:42:18 -0000 1.29
+++ parser/video_stream_def.cpp 12 Dec 2007 10:23:47 -0000 1.30
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.cpp,v 1.29 2007/12/04 21:42:18 strk Exp $
+// $Id: video_stream_def.cpp,v 1.30 2007/12/12 10:23:47 zoulunkai Exp $
#include "video_stream_def.h"
#include "video_stream_instance.h"
@@ -111,7 +111,7 @@
unsigned int dataSize = in->get_tag_end_position() - in->get_position();
unsigned int totSize = dataSize+padding;
- boost::shared_array<uint8_t> data ( new uint8_t[totSize] );
+ boost::shared_array<boost::uint8_t> data ( new boost::uint8_t[totSize]
);
in->read((char*)data.get(), dataSize);
if ( padding ) memset(&data[dataSize], 0, padding); // pad with zeroes
if needed
@@ -191,7 +191,7 @@
}
void
-video_stream_definition::setFrameData(boost::uint32_t frameNum,
boost::shared_array<uint8_t> data, boost::uint32_t size, media::videoFrameType
ft)
+video_stream_definition::setFrameData(boost::uint32_t frameNum,
boost::shared_array<boost::uint8_t> data, boost::uint32_t size,
media::videoFrameType ft)
{
EmbedFrameMap::iterator it = m_video_frames.find(frameNum);
if( it != m_video_frames.end() )
Index: parser/video_stream_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/video_stream_def.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- parser/video_stream_def.h 4 Dec 2007 11:45:33 -0000 1.19
+++ parser/video_stream_def.h 12 Dec 2007 10:23:47 -0000 1.20
@@ -16,7 +16,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-// $Id: video_stream_def.h,v 1.19 2007/12/04 11:45:33 strk Exp $
+// $Id: video_stream_def.h,v 1.20 2007/12/12 10:23:47 zoulunkai Exp $
#ifndef GNASH_VIDEO_STREAM_DEF_H
#define GNASH_VIDEO_STREAM_DEF_H
@@ -46,7 +46,7 @@
/// Contains the data, the data size and the type of the frame
class VideoData {
public:
- VideoData(boost::shared_array<uint8_t> data, boost::uint32_t size,
media::videoFrameType ft)
+ VideoData(boost::shared_array<boost::uint8_t> data, boost::uint32_t
size, media::videoFrameType ft)
:
videoData(data),
dataSize(size),
@@ -58,7 +58,7 @@
{
}
- boost::shared_array<uint8_t> videoData;
+ boost::shared_array<boost::uint8_t> videoData;
boost::uint32_t dataSize;
media::videoFrameType frameType;
};
@@ -124,10 +124,10 @@
boost::uint16_t m_char_id;
/// Reserved flags read from DEFINEVIDEOSTREAM tag
- uint8_t m_reserved_flags;
+ boost::uint8_t m_reserved_flags;
/// Flags read from DEFINEVIDEOSTREAM tag
- uint8_t m_deblocking_flags;
+ boost::uint8_t m_deblocking_flags;
/// Smoothing flag, as read from DEFINEVIDEOSTREAM tag
bool m_smoothing_flags;
@@ -177,7 +177,7 @@
/// @param img
/// Frame data. Ownership is transferred.
///
- void setFrameData(boost::uint32_t frameNum,
boost::shared_array<uint8_t> data, boost::uint32_t size, media::videoFrameType
ft);
+ void setFrameData(boost::uint32_t frameNum,
boost::shared_array<boost::uint8_t> data, boost::uint32_t size,
media::videoFrameType ft);
/// Width of the video
boost::uint32_t _width;
Index: swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- swf/PlaceObject2Tag.cpp 12 Dec 2007 06:16:31 -0000 1.26
+++ swf/PlaceObject2Tag.cpp 12 Dec 2007 10:23:47 -0000 1.27
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: PlaceObject2Tag.cpp,v 1.26 2007/12/12 06:16:31 zoulunkai Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.27 2007/12/12 10:23:47 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -108,7 +108,7 @@
break;
}
- uint8_t ch = key::INVALID;
+ boost::uint8_t ch = key::INVALID;
if (flags & (1 << 17)) // has KeyPress event
{
@@ -220,7 +220,7 @@
in->align();
// PlaceObject2 specific flags
- uint8_t has_flags2 = in->read_u8();
+ boost::uint8_t has_flags2 = in->read_u8();
bool has_actions = has_flags2 & (1 << 7);
bool has_clip_depth = has_flags2 & (1 << 6);
@@ -313,7 +313,7 @@
in->align();
// PlaceObject2 specific flags
- uint8_t has_flags2 = in->read_u8();
+ boost::uint8_t has_flags2 = in->read_u8();
bool has_actions = has_flags2 & (1 << 7);
bool has_clip_depth = has_flags2 & (1 << 6);
@@ -325,7 +325,7 @@
bool flag_move = has_flags2 & (1 << 0);
// PlaceObject3 specific flags, first 3 bits are unused
- uint8_t has_flags3 = in->read_u8();
+ boost::uint8_t has_flags3 = in->read_u8();
bool hasImage = has_flags3 & (1 << 4);
bool hasClassName = has_flags3 & (1 << 3);
@@ -333,8 +333,8 @@
bool has_blend_mode = has_flags3 & (1 << 1);
bool has_filters = has_flags3 & (1 << 0);
- uint8_t blend_mode = 0;
- uint8_t bitmask = 0;
+ boost::uint8_t blend_mode = 0;
+ boost::uint8_t bitmask = 0;
std::string className;
m_depth = in->read_u16()+character::staticDepthOffset;
Index: swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -b -r1.163 -r1.164
--- swf/tag_loaders.cpp 11 Dec 2007 10:06:01 -0000 1.163
+++ swf/tag_loaders.cpp 12 Dec 2007 10:23:47 -0000 1.164
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.163 2007/12/11 10:06:01 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.164 2007/12/12 10:23:47 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -348,7 +348,7 @@
#define CHUNKSIZE 256
- uint8_t buf[CHUNKSIZE];
+ boost::uint8_t buf[CHUNKSIZE];
unsigned long endTagPos = in.get_tag_end_position();
for (;;)
@@ -370,7 +370,7 @@
}
// Fill the buffer
- assert(sizeof(char) == sizeof(uint8_t));
+ assert(sizeof(char) == sizeof(boost::uint8_t));
in.read((char*)buf, chunkSize);
d_stream.next_in = &buf[0];
d_stream.avail_in = chunkSize;
@@ -441,7 +441,7 @@
size_t buffer_bytes = imWidth * imHeight;
- boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes] );
+ boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
@@ -449,7 +449,7 @@
// magical trevor contains this tag
// ea8bbad50ccbc52dd734dfc93a7f06a7 6964trev3c.swf
//
- uint8_t* data = im->data();
+ boost::uint8_t* data = im->data();
for (size_t i = 0; i < buffer_bytes; ++i)
{
data[4*i+3] = buffer[i];
@@ -473,7 +473,7 @@
in->ensureBytes(2+2+2+1); // the initial header
boost::uint16_t character_id = in->read_u16();
- uint8_t bitmap_format = in->read_u8(); // 3 == 8 bit, 4 == 16 bit, 5
== 32 bit
+ boost::uint8_t bitmap_format = in->read_u8(); // 3 == 8 bit, 4 == 16
bit, 5 == 32 bit
boost::uint16_t width = in->read_u16();
boost::uint16_t height = in->read_u16();
@@ -512,20 +512,20 @@
int pitch = (width * bytes_per_pixel + 3) & ~3;
int buffer_bytes = color_table_size * 3 + pitch * height;
- boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
+ boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
- uint8_t* color_table = buffer.get();
+ boost::uint8_t* color_table = buffer.get();
for (int j = 0; j < height; j++)
{
- uint8_t* image_in_row = buffer.get() + color_table_size
* 3 + j * pitch;
- uint8_t* image_out_row = image->scanline(j);
+ boost::uint8_t* image_in_row = buffer.get() +
color_table_size * 3 + j * pitch;
+ boost::uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
- uint8_t pixel = image_in_row[i * bytes_per_pixel];
+ boost::uint8_t pixel = image_in_row[i *
bytes_per_pixel];
image_out_row[i * 3 + 0] = color_table[pixel * 3 + 0];
image_out_row[i * 3 + 1] = color_table[pixel * 3 + 1];
image_out_row[i * 3 + 2] = color_table[pixel * 3 + 2];
@@ -540,15 +540,15 @@
int pitch = (width * bytes_per_pixel + 3) & ~3;
int buffer_bytes = pitch * height;
- boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
+ boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
for (int j = 0; j < height; j++)
{
- uint8_t* image_in_row = buffer.get() + j * pitch;
- uint8_t* image_out_row = image->scanline(j);
+ boost::uint8_t* image_in_row = buffer.get() + j * pitch;
+ boost::uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
boost::uint16_t pixel = image_in_row[i * 2] |
(image_in_row[i * 2 + 1] << 8);
@@ -568,7 +568,7 @@
int pitch = width * bytes_per_pixel;
int buffer_bytes = pitch * height;
- boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
+ boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
@@ -576,14 +576,14 @@
// Need to re-arrange ARGB into RGB.
for (int j = 0; j < height; j++)
{
- uint8_t* image_in_row = buffer.get() + j * pitch;
- uint8_t* image_out_row = image->scanline(j);
+ boost::uint8_t* image_in_row = buffer.get() + j * pitch;
+ boost::uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
- uint8_t a = image_in_row[i * 4 + 0];
- uint8_t r = image_in_row[i * 4 + 1];
- uint8_t g = image_in_row[i * 4 + 2];
- uint8_t b = image_in_row[i * 4 + 3];
+ boost::uint8_t a = image_in_row[i * 4 + 0];
+ boost::uint8_t r = image_in_row[i * 4 + 1];
+ boost::uint8_t g = image_in_row[i * 4 + 2];
+ boost::uint8_t b = image_in_row[i * 4 + 3];
image_out_row[i * 3 + 0] = r;
image_out_row[i * 3 + 1] = g;
image_out_row[i * 3 + 2] = b;
@@ -626,20 +626,20 @@
int pitch = (width * bytes_per_pixel + 3) & ~3;
int buffer_bytes = color_table_size * 4 + pitch * height;
- boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
+ boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
- uint8_t* color_table = buffer.get();
+ boost::uint8_t* color_table = buffer.get();
for (int j = 0; j < height; j++)
{
- uint8_t* image_in_row = buffer.get() + color_table_size
* 4 + j * pitch;
- uint8_t* image_out_row = image->scanline(j);
+ boost::uint8_t* image_in_row = buffer.get() +
color_table_size * 4 + j * pitch;
+ boost::uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
- uint8_t pixel = image_in_row[i * bytes_per_pixel];
+ boost::uint8_t pixel = image_in_row[i *
bytes_per_pixel];
image_out_row[i * 4 + 0] = color_table[pixel * 4 + 0];
image_out_row[i * 4 + 1] = color_table[pixel * 4 + 1];
image_out_row[i * 4 + 2] = color_table[pixel * 4 + 2];
@@ -655,15 +655,15 @@
int pitch = (width * bytes_per_pixel + 3) & ~3;
int buffer_bytes = pitch * height;
- boost::scoped_array<uint8_t> buffer ( new uint8_t[buffer_bytes]
);
+ boost::scoped_array<boost::uint8_t> buffer ( new
boost::uint8_t[buffer_bytes] );
inflate_wrapper(*in, buffer.get(), buffer_bytes);
assert(in->get_position() <= in->get_tag_end_position());
for (int j = 0; j < height; j++)
{
- uint8_t* image_in_row = buffer.get() + j * pitch;
- uint8_t* image_out_row = image->scanline(j);
+ boost::uint8_t* image_in_row = buffer.get() + j * pitch;
+ boost::uint8_t* image_out_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
boost::uint16_t pixel = image_in_row[i * 2] |
(image_in_row[i * 2 + 1] << 8);
@@ -687,13 +687,13 @@
// Need to re-arrange ARGB into RGBA.
for (int j = 0; j < height; j++)
{
- uint8_t* image_row = image->scanline(j);
+ boost::uint8_t* image_row = image->scanline(j);
for (int i = 0; i < width; i++)
{
- uint8_t a = image_row[i * 4 + 0];
- uint8_t r = image_row[i * 4 + 1];
- uint8_t g = image_row[i * 4 + 2];
- uint8_t b = image_row[i * 4 + 3];
+ boost::uint8_t a = image_row[i * 4 + 0];
+ boost::uint8_t r = image_row[i * 4 + 1];
+ boost::uint8_t g = image_row[i * 4 + 2];
+ boost::uint8_t b = image_row[i * 4 + 3];
image_row[i * 4 + 0] = r;
image_row[i * 4 + 1] = g;
image_row[i * 4 + 2] = b;
@@ -1504,9 +1504,9 @@
assert(tag == SWF::REFLEX); // 777
in->ensureBytes(3);
- uint8_t first = in->read_u8();
- uint8_t second = in->read_u8();
- uint8_t third = in->read_u8();
+ boost::uint8_t first = in->read_u8();
+ boost::uint8_t second = in->read_u8();
+ boost::uint8_t third = in->read_u8();
IF_VERBOSE_PARSE (
log_parse(_(" reflex = \"%c%c%c\""), first, second, third);
Index: vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- vm/ASHandlers.cpp 12 Dec 2007 04:06:40 -0000 1.169
+++ vm/ASHandlers.cpp 12 Dec 2007 10:23:47 -0000 1.170
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ASHandlers.cpp,v 1.169 2007/12/12 04:06:40 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.170 2007/12/12 10:23:47 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -651,7 +651,7 @@
// skip the specified number of actions.
//
unsigned int framenum = code.read_int16(thread.pc+3);
- uint8_t skip = code[thread.pc+5];
+ boost::uint8_t skip = code[thread.pc+5];
character* target = env.get_target();
sprite_instance* target_sprite = target->to_movie();
@@ -1771,7 +1771,7 @@
thread.ensureStack(1); // expression
// how many actions to skip if frame has not been loaded
- uint8_t skip = code[thread.pc+3];
+ boost::uint8_t skip = code[thread.pc+3];
// env.top(0) contains frame specification,
// evaluated as for ActionGotoExpression
@@ -1866,7 +1866,7 @@
int id=0; // for dict (constant pool) lookup
// declared here because also used
// by verbose action output
- uint8_t type = code[3 + i];
+ boost::uint8_t type = code[3 + i];
i++;
switch (type)
@@ -1914,7 +1914,7 @@
case pushRegister: // 4
{
- uint8_t reg = code[3 + i];
+ boost::uint8_t reg = code[3 + i];
++i;
if ( thread.isFunction2() &&
env.num_local_registers() )
{
@@ -2055,7 +2055,7 @@
SWFHandlers::CommonGetUrl(as_environment& env,
as_value target, // the target window, or _level1..10
const char* url_c,
- uint8_t method /*
+ boost::uint8_t method /*
* Bit-packed as follow
*
* SendVarsMethod:2 (0:NONE 1:GET 2:POST)
@@ -2300,7 +2300,7 @@
assert( code[thread.pc] == SWF::ACTION_GETURL2 );
- uint8_t method = code[thread.pc + 3];
+ boost::uint8_t method = code[thread.pc + 3];
as_value url_val = env.top(1);
if ( url_val.is_undefined() )
@@ -3690,7 +3690,7 @@
//cerr << " nargs:" << nargs << endl;
// Get the count of local registers used by this function.
- uint8_t register_count = code[i];
+ boost::uint8_t register_count = code[i];
i++;
//cerr << " nregisters:" << nargs << endl;
@@ -3706,7 +3706,7 @@
// Get the register assignments and names of the arguments.
for (unsigned n = 0; n < nargs; n++)
{
- uint8_t arg_register = code[i];
+ boost::uint8_t arg_register = code[i];
++i;
// @@ security: watch out for possible missing terminator here!
@@ -3786,20 +3786,20 @@
size_t i = thread.pc + 3; // skip tag id and length
- uint8_t flags = code[i];
+ boost::uint8_t flags = code[i];
++i;
bool doCatch = flags & 1;
bool doFinally = flags & (1<<1);
bool catchInRegister = flags&(1<<2);
- uint8_t reserved = flags&0xE0;
+ boost::uint8_t reserved = flags&0xE0;
boost::uint16_t trySize = code.read_uint16(i); i += 2;
boost::uint16_t catchSize = code.read_uint16(i); i += 2;
boost::uint16_t finallySize = code.read_uint16(i); i += 2;
const char* catchName = NULL;
- uint8_t catchRegister = 0;
+ boost::uint8_t catchRegister = 0;
if (!doFinally)
finallySize = 0;
@@ -3998,7 +3998,7 @@
const action_buffer& code = thread.code;
- uint8_t reg = code[thread.pc + 3];
+ boost::uint8_t reg = code[thread.pc + 3];
// Save top of stack in specified register.
if ( thread.isFunction2() && env.num_local_registers() )
Index: vm/ASHandlers.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- vm/ASHandlers.h 27 Nov 2007 22:06:03 -0000 1.12
+++ vm/ASHandlers.h 12 Dec 2007 10:23:47 -0000 1.13
@@ -144,7 +144,7 @@
///
static void CommonGetUrl(as_environment& env,
as_value target, const char* url,
- uint8_t method);
+ boost::uint8_t method);
/// Common code for SetTarget and SetTargetExpression
//
Index: vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- vm/ActionExec.cpp 4 Dec 2007 11:45:34 -0000 1.60
+++ vm/ActionExec.cpp 12 Dec 2007 10:23:47 -0000 1.61
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ActionExec.cpp,v 1.60 2007/12/04 11:45:34 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.61 2007/12/12 10:23:47 zoulunkai Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -300,7 +300,7 @@
}
// Get the opcode.
- uint8_t action_id = code[pc];
+ boost::uint8_t action_id = code[pc];
size_t oldPc = pc;
IF_VERBOSE_ACTION (
@@ -495,7 +495,7 @@
#endif
// Get the opcode.
- uint8_t action_id = code[next_pc];
+ boost::uint8_t action_id = code[next_pc];
// Set default next_pc offset, control flow action handlers
// will be able to reset it.
@@ -711,7 +711,7 @@
while (lpc < to)
{
// Get the opcode.
- uint8_t action_id = code[lpc];
+ boost::uint8_t action_id = code[lpc];
os << " PC:" << lpc << " - EX: " << code.disasm(lpc) << std::endl;
Index: vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- vm/ActionExec.h 4 Dec 2007 11:45:34 -0000 1.27
+++ vm/ActionExec.h 12 Dec 2007 10:23:47 -0000 1.28
@@ -62,7 +62,7 @@
{/**/}
tryBlock(size_t cur_off, size_t try_size, size_t catch_size,
- size_t finally_size, uint8_t register_index, int stack_depth)
+ size_t finally_size, boost::uint8_t register_index, int
stack_depth)
: mCatchOffset(cur_off + try_size),
mFinallyOffset(cur_off + try_size + catch_size),
mAfterTriedOffset(cur_off + try_size + catch_size +
finally_size),
@@ -78,7 +78,7 @@
size_t mSavedEndOffset;
bool mNamed;
std::string mName;
- uint8_t mReg;
+ boost::uint8_t mReg;
tryState mState;
as_value mThrownFromCatch;
boost::uint32_t mStackDepth;
Index: vm/CodeStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/CodeStream.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- vm/CodeStream.h 4 Dec 2007 11:45:34 -0000 1.4
+++ vm/CodeStream.h 12 Dec 2007 10:23:47 -0000 1.5
@@ -137,11 +137,11 @@
}
/// Read an opcode for ActionScript 3
- uint8_t read_as3op()
+ boost::uint8_t read_as3op()
{
if (mCurrent == mEnd)
return 0;
- return static_cast<uint8_t> (*mCurrent++);
+ return static_cast<boost::uint8_t> (*mCurrent++);
}
/// Provide the offset into the stream of the current position. Can be
@@ -186,11 +186,11 @@
}
/// Read an unsigned 8-bit character.
- uint8_t read_u8()
+ boost::uint8_t read_u8()
{
if (mCurrent == mEnd)
throw CodeStreamException();
- return static_cast<uint8_t> (*mCurrent++);
+ return static_cast<boost::uint8_t> (*mCurrent++);
}
/// Set a stop at position bytes from the start. This becomes the new
Index: vm/Machine.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Machine.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- vm/Machine.cpp 4 Dec 2007 11:45:34 -0000 1.5
+++ vm/Machine.cpp 12 Dec 2007 10:23:47 -0000 1.6
@@ -257,7 +257,7 @@
void
Machine::execute()
{
- uint8_t opcode;
+ boost::uint8_t opcode;
for ( ; ; )
{
@@ -1472,7 +1472,7 @@
/// scope -- The scope object at depth
case SWF::ABC_ACTION_GETSCOPEOBJECT:
{
- uint8_t depth = mStream->read_u8();
+ boost::uint8_t depth = mStream->read_u8();
mStack.grow(1);
mStack.top(0) = mScopeStack.top(depth).mScope;
break;
Index: vm/asName.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/asName.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- vm/asName.h 18 Oct 2007 11:47:56 -0000 1.1
+++ vm/asName.h 12 Dec 2007 10:23:47 -0000 1.2
@@ -69,7 +69,7 @@
FLAG_NSSET = 0x10
} flags;
- uint8_t mFlags;
+ boost::uint8_t mFlags;
std::vector<asNamespace*> *mNamespaceSet;
asName() : mFlags(0), mNamespaceSet(NULL), mName(0), mPairName(0),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/server asobj/BevelFilter_as.cpp asobj/Blu...,
Zou Lunkai <=