[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 829b1fbdb6a53e02a859
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 829b1fbdb6a53e02a8594c0183682f6768a74126 |
|
Date: |
Mon, 30 Aug 2010 13:14:10 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 829b1fbdb6a53e02a8594c0183682f6768a74126 (commit)
via cbc0292118ef8edb00b313f949f351ef314a7911 (commit)
via 3f7978254da117c041d80877678a068c854edc46 (commit)
via 05eef2413e8c30361250460e5eecbc68dc6e4424 (commit)
via d605216a285e7d4abda558938de49e8641d43404 (commit)
from 2c748f4e461858dbafaf253191c196de9661630e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=829b1fbdb6a53e02a8594c0183682f6768a74126
commit 829b1fbdb6a53e02a8594c0183682f6768a74126
Author: Benjamin Wolsey <address@hidden>
Date: Mon Aug 30 14:35:05 2010 +0200
Drop obsolete forward declarations.
diff --git a/libcore/BitmapMovie.h b/libcore/BitmapMovie.h
index 51394a3..f2c55e4 100644
--- a/libcore/BitmapMovie.h
+++ b/libcore/BitmapMovie.h
@@ -24,9 +24,7 @@
#include "Movie.h" // for inheritance
// Forward declarations
-namespace gnash
-{
- class GnashImage;
+namespace gnash {
class DisplayObject;
}
diff --git a/libcore/MovieClip.h b/libcore/MovieClip.h
index c9ce0d0..48e7d17 100644
--- a/libcore/MovieClip.h
+++ b/libcore/MovieClip.h
@@ -51,7 +51,6 @@ namespace gnash {
class TextField;
class BitmapData_as;
class CachedBitmap;
- class GnashImage;
namespace SWF {
class PlaceObject2Tag;
}
http://git.savannah.gnu.org/cgit//commit/?id=cbc0292118ef8edb00b313f949f351ef314a7911
commit cbc0292118ef8edb00b313f949f351ef314a7911
Author: Benjamin Wolsey <address@hidden>
Date: Mon Aug 30 13:41:39 2010 +0200
Rename base classes.
diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
index 88cce2e..d24071e 100644
--- a/libbase/GnashImage.cpp
+++ b/libbase/GnashImage.cpp
@@ -153,23 +153,23 @@ mergeAlpha(ImageRGBA& im, GnashImage::const_iterator
alphaData,
// Write the given image to the given out stream, in jpeg format.
void
-ImageOutput::writeImageData(FileType type,
+Output::writeImageData(FileType type,
boost::shared_ptr<IOChannel> out, const GnashImage& image, int quality)
{
const size_t width = image.width();
const size_t height = image.height();
- std::auto_ptr<ImageOutput> outChannel;
+ std::auto_ptr<Output> outChannel;
switch (type) {
#ifdef USE_PNG
case GNASH_FILETYPE_PNG:
- outChannel = PngImageOutput::create(out, width, height, quality);
+ outChannel = PngOutput::create(out, width, height, quality);
break;
#endif
case GNASH_FILETYPE_JPEG:
- outChannel = JpegImageOutput::create(out, width, height, quality);
+ outChannel = JpegOutput::create(out, width, height, quality);
break;
default:
log_error("Requested to write image as unsupported filetype");
@@ -191,10 +191,10 @@ ImageOutput::writeImageData(FileType type,
// See gnash.h for file types.
std::auto_ptr<GnashImage>
-ImageInput::readImageData(boost::shared_ptr<IOChannel> in, FileType type)
+Input::readImageData(boost::shared_ptr<IOChannel> in, FileType type)
{
std::auto_ptr<GnashImage> im;
- std::auto_ptr<ImageInput> inChannel;
+ std::auto_ptr<Input> inChannel;
switch (type) {
#ifdef USE_PNG
@@ -259,7 +259,7 @@ ImageInput::readImageData(boost::shared_ptr<IOChannel> in,
FileType type)
// For reading SWF JPEG3-style image data, like ordinary JPEG,
// but stores the data in ImageRGBA format.
std::auto_ptr<ImageRGBA>
-ImageInput::readSWFJpeg3(boost::shared_ptr<IOChannel> in)
+Input::readSWFJpeg3(boost::shared_ptr<IOChannel> in)
{
std::auto_ptr<ImageRGBA> im;
diff --git a/libbase/GnashImage.h b/libbase/GnashImage.h
index 4642568..bccc724 100644
--- a/libbase/GnashImage.h
+++ b/libbase/GnashImage.h
@@ -259,22 +259,22 @@ public:
};
/// The base class for reading image data.
-class ImageInput : boost::noncopyable
+class Input : boost::noncopyable
{
public:
- /// Construct an ImageInput object to read from an IOChannel.
+ /// Construct an Input object to read from an IOChannel.
//
/// @param in The stream to read data from. Ownership is shared
- /// between caller and ImageInput, so it is freed
+ /// between caller and Input, so it is freed
/// automatically when the last owner is destroyed.
- ImageInput(boost::shared_ptr<IOChannel> in)
+ Input(boost::shared_ptr<IOChannel> in)
:
_inStream(in),
_type(GNASH_IMAGE_INVALID)
{}
- virtual ~ImageInput() {}
+ virtual ~Input() {}
/// Begin processing the image data.
virtual void read() = 0;
@@ -331,25 +331,25 @@ protected:
};
// Base class for writing image data.
-class ImageOutput : boost::noncopyable
+class Output : boost::noncopyable
{
public:
- /// Construct an ImageOutput for writing to an IOChannel
+ /// Construct an Output for writing to an IOChannel
//
/// @param out The gnash::IOChannel to write the image to. Ownership
/// is shared.
/// @param width The width of the resulting image
/// @param height The height of the resulting image.
- ImageOutput(boost::shared_ptr<IOChannel> out, size_t width, size_t height)
+ Output(boost::shared_ptr<IOChannel> out, size_t width, size_t height)
:
_width(width),
_height(height),
_outStream(out)
{}
- virtual ~ImageOutput() {}
+ virtual ~Output() {}
/// Write RGB image data using the parameters supplied at construction.
//
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index e90d734..7469598 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -46,7 +46,7 @@ readData(GifFileType* ft, GifByteType* data, int length)
GifInput::GifInput(boost::shared_ptr<IOChannel> in) :
- ImageInput(in),
+ Input(in),
_gif(NULL),
_currentRow(0)
{
diff --git a/libbase/GnashImageGif.h b/libbase/GnashImageGif.h
index 2f59214..8362b1f 100644
--- a/libbase/GnashImageGif.h
+++ b/libbase/GnashImageGif.h
@@ -38,7 +38,7 @@ namespace gnash { class IOChannel; }
namespace gnash {
namespace image {
-class GifInput : public ImageInput
+class GifInput : public Input
{
public:
@@ -81,10 +81,10 @@ public:
/// Create a GifInput and transfer ownership to the caller.
//
/// @param in The IOChannel to read GIF data from.
- DSOEXPORT static std::auto_ptr<ImageInput> create(
+ DSOEXPORT static std::auto_ptr<Input> create(
boost::shared_ptr<IOChannel> in)
{
- std::auto_ptr<ImageInput> ret ( new GifInput(in) );
+ std::auto_ptr<Input> ret ( new GifInput(in) );
if ( ret.get() ) ret->read();
return ret;
}
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index 59b325d..ff4cc89 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -235,7 +235,7 @@ private:
JpegInput::JpegInput(boost::shared_ptr<IOChannel> in)
:
- ImageInput(in),
+ Input(in),
_errorOccurred(0),
_compressorOpened(false)
{
@@ -577,9 +577,9 @@ private:
};
-JpegImageOutput::JpegImageOutput(boost::shared_ptr<IOChannel> out, size_t
width, size_t height, int quality)
+JpegOutput::JpegOutput(boost::shared_ptr<IOChannel> out, size_t width, size_t
height, int quality)
:
- ImageOutput(out, width, height)
+ Output(out, width, height)
{
m_cinfo.err = jpeg_std_error(&m_jerr);
@@ -598,7 +598,7 @@
JpegImageOutput::JpegImageOutput(boost::shared_ptr<IOChannel> out, size_t width,
}
-JpegImageOutput::~JpegImageOutput()
+JpegOutput::~JpegOutput()
{
jpeg_finish_compress(&m_cinfo);
jpeg_destroy_compress(&m_cinfo);
@@ -606,7 +606,7 @@ JpegImageOutput::~JpegImageOutput()
void
-JpegImageOutput::writeImageRGB(const unsigned char* rgbData)
+JpegOutput::writeImageRGB(const unsigned char* rgbData)
{
// RGB...
const size_t components = 3;
@@ -621,12 +621,12 @@ JpegImageOutput::writeImageRGB(const unsigned char*
rgbData)
}
-std::auto_ptr<ImageOutput>
-JpegImageOutput::create(boost::shared_ptr<IOChannel> out, size_t width,
+std::auto_ptr<Output>
+JpegOutput::create(boost::shared_ptr<IOChannel> out, size_t width,
size_t height, int quality)
{
- std::auto_ptr<ImageOutput> outChannel(
- new JpegImageOutput(out, width, height, quality));
+ std::auto_ptr<Output> outChannel(
+ new JpegOutput(out, width, height, quality));
return outChannel;
}
diff --git a/libbase/GnashImageJpeg.h b/libbase/GnashImageJpeg.h
index 267ba5d..dc49df5 100644
--- a/libbase/GnashImageJpeg.h
+++ b/libbase/GnashImageJpeg.h
@@ -50,8 +50,8 @@ namespace image {
/// Class for reading JPEG image data.
//
-/// This uses the IJG jpeglib to implement the ImageInput interface.
-class JpegInput : public ImageInput
+/// This uses the IJG jpeglib to implement the Input interface.
+class JpegInput : public Input
{
private:
@@ -123,9 +123,9 @@ public:
/// Create a JpegInput and transfer ownership to the caller.
//
/// @param in The IOChannel to read JPEG data from.
- static std::auto_ptr<ImageInput> create(boost::shared_ptr<IOChannel> in)
+ static std::auto_ptr<Input> create(boost::shared_ptr<IOChannel> in)
{
- std::auto_ptr<ImageInput> ret(new JpegInput(in));
+ std::auto_ptr<Input> ret(new JpegInput(in));
// might throw an exception (I guess)
if (ret.get()) ret->read();
return ret;
@@ -168,34 +168,34 @@ public:
};
// Class for writing JPEG image data.
-class JpegImageOutput : public ImageOutput
+class JpegOutput : public Output
{
public:
- /// Constract a JpegImageOutput for writing to an IOChannel
+ /// Constract a JpegOutput for writing to an IOChannel
//
/// @param out The gnash::IOChannel to write the image to
/// @param width The width of the resulting image
/// @param height The height of the resulting image.
/// @param quality The quality of the created image, from 1-100.
- JpegImageOutput(boost::shared_ptr<IOChannel> out, size_t width,
+ JpegOutput(boost::shared_ptr<IOChannel> out, size_t width,
size_t height, int quality);
- ~JpegImageOutput();
+ ~JpegOutput();
/// Write RGB image data using the parameters supplied at construction.
//
/// @param rgbData The raw RGB image data to write as a JPEG.
void writeImageRGB(const unsigned char* rgbData);
- /// Create a JpegImageOutput, transferring ownership to the caller.
+ /// Create a JpegOutput, transferring ownership to the caller.
//
/// @param out The gnash::IOChannel to write the image to
/// @param width The width of the resulting image
/// @param height The height of the resulting image.
/// @param quality The quality of the created image, from 1-100.
- static std::auto_ptr<ImageOutput> create(boost::shared_ptr<IOChannel> out,
+ static std::auto_ptr<Output> create(boost::shared_ptr<IOChannel> out,
size_t width, size_t height, int quality);
private:
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 69558bd..3acad77 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -73,7 +73,7 @@ flushData(png_structp /*pngptr*/)
} // unnamed namespace
PngInput::PngInput(boost::shared_ptr<IOChannel> in) :
- ImageInput(in),
+ Input(in),
_pngPtr(0),
_infoPtr(0),
_rowPtrs(0),
@@ -231,9 +231,9 @@ PngInput::read()
/// PNG output
///
-PngImageOutput::PngImageOutput(boost::shared_ptr<IOChannel> out, size_t width,
size_t height, int /* quality */)
+PngOutput::PngOutput(boost::shared_ptr<IOChannel> out, size_t width, size_t
height, int /* quality */)
:
- ImageOutput(out, width, height),
+ Output(out, width, height),
_pngPtr(0),
_infoPtr(0)
{
@@ -241,14 +241,14 @@
PngImageOutput::PngImageOutput(boost::shared_ptr<IOChannel> out, size_t width, s
}
-PngImageOutput::~PngImageOutput()
+PngOutput::~PngOutput()
{
png_destroy_write_struct(&_pngPtr, &_infoPtr);
}
void
-PngImageOutput::init()
+PngOutput::init()
{
// Initialize png library.
_pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
@@ -265,7 +265,7 @@ PngImageOutput::init()
}
void
-PngImageOutput::writeImageRGBA(const unsigned char* rgbaData)
+PngOutput::writeImageRGBA(const unsigned char* rgbaData)
{
png_set_write_fn(_pngPtr, _outStream.get(), &writeData, &flushData);
@@ -291,7 +291,7 @@ PngImageOutput::writeImageRGBA(const unsigned char*
rgbaData)
void
-PngImageOutput::writeImageRGB(const unsigned char* rgbData)
+PngOutput::writeImageRGB(const unsigned char* rgbData)
{
png_set_write_fn(_pngPtr, _outStream.get(), &writeData, &flushData);
@@ -316,12 +316,12 @@ PngImageOutput::writeImageRGB(const unsigned char*
rgbData)
}
-std::auto_ptr<ImageOutput>
-PngImageOutput::create(boost::shared_ptr<IOChannel> out, size_t width,
+std::auto_ptr<Output>
+PngOutput::create(boost::shared_ptr<IOChannel> out, size_t width,
size_t height, int quality)
{
- std::auto_ptr<ImageOutput> outChannel(
- new PngImageOutput(out, width, height, quality));
+ std::auto_ptr<Output> outChannel(
+ new PngOutput(out, width, height, quality));
return outChannel;
}
diff --git a/libbase/GnashImagePng.h b/libbase/GnashImagePng.h
index 9230618..375a6f0 100644
--- a/libbase/GnashImagePng.h
+++ b/libbase/GnashImagePng.h
@@ -44,7 +44,7 @@ namespace gnash {
namespace gnash {
namespace image {
-class PngInput : public ImageInput
+class PngInput : public Input
{
public:
@@ -81,10 +81,10 @@ public:
/// Create a PngInput and transfer ownership to the caller.
//
/// @param in The IOChannel to read PNG data from.
- DSOEXPORT static std::auto_ptr<ImageInput> create(
+ DSOEXPORT static std::auto_ptr<Input> create(
boost::shared_ptr<IOChannel> in)
{
- std::auto_ptr<ImageInput> ret ( new PngInput(in) );
+ std::auto_ptr<Input> ret ( new PngInput(in) );
if (ret.get()) ret->read();
return ret;
}
@@ -109,7 +109,7 @@ private:
};
// Class object for writing PNG image data.
-class PngImageOutput : public ImageOutput
+class PngOutput : public Output
{
public:
@@ -119,16 +119,16 @@ public:
/// @param out The IOChannel used for output. Must be kept alive
/// throughout
/// @param quality Unused in PNG output
- PngImageOutput(boost::shared_ptr<IOChannel> out, size_t width,
+ PngOutput(boost::shared_ptr<IOChannel> out, size_t width,
size_t height, int quality);
- ~PngImageOutput();
+ ~PngOutput();
void writeImageRGB(const unsigned char* rgbData);
void writeImageRGBA(const unsigned char* rgbaData);
- static std::auto_ptr<ImageOutput> create(boost::shared_ptr<IOChannel> out,
+ static std::auto_ptr<Output> create(boost::shared_ptr<IOChannel> out,
size_t width, size_t height, int quality);
private:
diff --git a/libcore/MovieFactory.cpp b/libcore/MovieFactory.cpp
index 54d4517..b8e5d52 100644
--- a/libcore/MovieFactory.cpp
+++ b/libcore/MovieFactory.cpp
@@ -155,7 +155,7 @@ createBitmapMovie(std::auto_ptr<IOChannel> in, const
std::string& url,
try {
std::auto_ptr<image::GnashImage> im(
- image::ImageInput::readImageData(imageData, type));
+ image::Input::readImageData(imageData, type));
if (!im.get()) {
log_error(_("Can't read image file from %s"), url);
diff --git a/libcore/swf/tag_loaders.cpp b/libcore/swf/tag_loaders.cpp
index f57a59e..b5a6efb 100644
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -375,7 +375,7 @@ define_bits_jpeg2_loader(SWFStream& in, TagType tag,
movie_definition& m,
boost::shared_ptr<IOChannel> ad(StreamAdapter::getFile(in,
in.get_tag_end_position()).release() );
- std::auto_ptr<image::GnashImage> im (image::ImageInput::readImageData(ad,
ft));
+ std::auto_ptr<image::GnashImage> im (image::Input::readImageData(ad, ft));
Renderer* renderer = r.renderer();
if (!renderer) {
@@ -510,7 +510,7 @@ define_bits_jpeg3_loader(SWFStream& in, TagType tag,
movie_definition& m,
// Read rgb data.
boost::shared_ptr<IOChannel> ad(StreamAdapter::getFile(in,
alpha_position).release());
- std::auto_ptr<image::ImageRGBA> im = image::ImageInput::readSWFJpeg3(ad);
+ std::auto_ptr<image::ImageRGBA> im = image::Input::readSWFJpeg3(ad);
/// Failure to read the jpeg.
if (!im.get()) return;
diff --git a/librender/Renderer_agg.cpp b/librender/Renderer_agg.cpp
index 6794be0..e069e55 100644
--- a/librender/Renderer_agg.cpp
+++ b/librender/Renderer_agg.cpp
@@ -713,7 +713,7 @@ public:
}
}
- image::ImageOutput::writeImageData(type, io, im, 100);
+ image::Output::writeImageData(type, io, im, 100);
}
template<typename SourceFormat, typename Matrix>
http://git.savannah.gnu.org/cgit//commit/?id=3f7978254da117c041d80877678a068c854edc46
commit 3f7978254da117c041d80877678a068c854edc46
Author: Benjamin Wolsey <address@hidden>
Date: Mon Aug 30 13:40:49 2010 +0200
Rename input classes.
diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
index 0f6a03b..88cce2e 100644
--- a/libbase/GnashImage.cpp
+++ b/libbase/GnashImage.cpp
@@ -199,16 +199,16 @@ ImageInput::readImageData(boost::shared_ptr<IOChannel>
in, FileType type)
switch (type) {
#ifdef USE_PNG
case GNASH_FILETYPE_PNG:
- inChannel = PngImageInput::create(in);
+ inChannel = PngInput::create(in);
break;
#endif
#ifdef USE_GIF
case GNASH_FILETYPE_GIF:
- inChannel = GifImageInput::create(in);
+ inChannel = GifInput::create(in);
break;
#endif
case GNASH_FILETYPE_JPEG:
- inChannel = JpegImageInput::create(in);
+ inChannel = JpegInput::create(in);
break;
default:
break;
@@ -233,7 +233,7 @@ ImageInput::readImageData(boost::shared_ptr<IOChannel> in,
FileType type)
}
}
catch (std::bad_alloc& e) {
- // This should be caught here because ~JpegImageInput can also
+ // This should be caught here because ~JpegInput can also
// throw an exception on stack unwinding and this confuses
// remote catchers.
log_error("Out of memory while trying to create %dx%d image",
@@ -265,8 +265,8 @@ ImageInput::readSWFJpeg3(boost::shared_ptr<IOChannel> in)
std::auto_ptr<ImageRGBA> im;
// Calling with headerBytes as 0 has a special effect...
- std::auto_ptr<JpegImageInput> j_in(
- JpegImageInput::createSWFJpeg2HeaderOnly(in, 0));
+ std::auto_ptr<JpegInput> j_in(
+ JpegInput::createSWFJpeg2HeaderOnly(in, 0));
// If this isn't true, we should have thrown.
assert(j_in.get());
diff --git a/libbase/GnashImage.h b/libbase/GnashImage.h
index 151594f..4642568 100644
--- a/libbase/GnashImage.h
+++ b/libbase/GnashImage.h
@@ -37,7 +37,7 @@
// Forward declarations
namespace gnash {
class IOChannel;
- class JpegImageInput;
+ class JpegInput;
}
namespace gnash {
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index 9927652..e90d734 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -45,35 +45,35 @@ readData(GifFileType* ft, GifByteType* data, int length)
}
-GifImageInput::GifImageInput(boost::shared_ptr<IOChannel> in) :
+GifInput::GifInput(boost::shared_ptr<IOChannel> in) :
ImageInput(in),
_gif(NULL),
_currentRow(0)
{
}
-GifImageInput::~GifImageInput()
+GifInput::~GifInput()
{
// Clean up allocated data.
DGifCloseFile(_gif);
}
size_t
-GifImageInput::getHeight() const
+GifInput::getHeight() const
{
assert (_gif);
return _gif->SHeight;
}
size_t
-GifImageInput::getWidth() const
+GifInput::getWidth() const
{
assert (_gif);
return _gif->SWidth;
}
void
-GifImageInput::readScanline(unsigned char* rgbData)
+GifInput::readScanline(unsigned char* rgbData)
{
ColorMapObject* colormap = (_gif->Image.ColorMap) ?
@@ -97,7 +97,7 @@ GifImageInput::readScanline(unsigned char* rgbData)
}
void
-GifImageInput::read()
+GifInput::read()
{
_gif = DGifOpen(_inStream.get(), &readData);
diff --git a/libbase/GnashImageGif.h b/libbase/GnashImageGif.h
index 38baf40..2f59214 100644
--- a/libbase/GnashImageGif.h
+++ b/libbase/GnashImageGif.h
@@ -38,19 +38,19 @@ namespace gnash { class IOChannel; }
namespace gnash {
namespace image {
-class GifImageInput : public ImageInput
+class GifInput : public ImageInput
{
public:
- /// Construct a GifImageInput object to read from an IOChannel.
+ /// Construct a GifInput object to read from an IOChannel.
//
/// @param in The stream to read GIF data from. Ownership is shared
- /// between caller and GifImageInput, so it is freed
+ /// between caller and GifInput, so it is freed
/// automatically when the last owner is destroyed.
- GifImageInput(boost::shared_ptr<IOChannel> in);
+ GifInput(boost::shared_ptr<IOChannel> in);
- ~GifImageInput();
+ ~GifInput();
/// Begin processing the image data.
void read();
@@ -78,13 +78,13 @@ public:
void readScanline(unsigned char* rgb_data);
- /// Create a GifImageInput and transfer ownership to the caller.
+ /// Create a GifInput and transfer ownership to the caller.
//
/// @param in The IOChannel to read GIF data from.
DSOEXPORT static std::auto_ptr<ImageInput> create(
boost::shared_ptr<IOChannel> in)
{
- std::auto_ptr<ImageInput> ret ( new GifImageInput(in) );
+ std::auto_ptr<ImageInput> ret ( new GifInput(in) );
if ( ret.get() ) ret->read();
return ret;
}
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index e8ff5e1..59b325d 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -69,7 +69,7 @@ jpeg_error_exit(j_common_ptr cinfo)
{
// Set a flag to stop parsing
- JpegImageInput* in = static_cast<JpegImageInput*>(cinfo->client_data);
+ JpegInput* in = static_cast<JpegInput*>(cinfo->client_data);
in->errorOccurred(cinfo->err->jpeg_message_table[cinfo->err->msg_code]);
@@ -233,7 +233,7 @@ private:
};
-JpegImageInput::JpegImageInput(boost::shared_ptr<IOChannel> in)
+JpegInput::JpegInput(boost::shared_ptr<IOChannel> in)
:
ImageInput(in),
_errorOccurred(0),
@@ -250,7 +250,7 @@ JpegImageInput::JpegImageInput(boost::shared_ptr<IOChannel>
in)
}
-JpegImageInput::~JpegImageInput()
+JpegInput::~JpegInput()
{
finishImage();
@@ -265,7 +265,7 @@ JpegImageInput::~JpegImageInput()
void
-JpegImageInput::discardPartialBuffer()
+JpegInput::discardPartialBuffer()
{
rw_source_IOChannel* src = (rw_source_IOChannel*) m_cinfo.src;
@@ -278,7 +278,7 @@ JpegImageInput::discardPartialBuffer()
void
-JpegImageInput::readHeader(unsigned int maxHeaderBytes)
+JpegInput::readHeader(unsigned int maxHeaderBytes)
{
if (setjmp(_jmpBuf)) {
std::stringstream ss;
@@ -322,7 +322,7 @@ JpegImageInput::readHeader(unsigned int maxHeaderBytes)
void
-JpegImageInput::read()
+JpegInput::read()
{
assert(!_compressorOpened);
@@ -379,7 +379,7 @@ JpegImageInput::read()
void
-JpegImageInput::finishImage()
+JpegInput::finishImage()
{
if (setjmp(_jmpBuf)) {
std::stringstream ss;
@@ -396,7 +396,7 @@ JpegImageInput::finishImage()
// Return the height of the image. Take the data from our m_cinfo struct.
size_t
-JpegImageInput::getHeight() const
+JpegInput::getHeight() const
{
assert(_compressorOpened);
return m_cinfo.output_height;
@@ -405,7 +405,7 @@ JpegImageInput::getHeight() const
// Return the width of the image. Take the data from our m_cinfo struct.
size_t
-JpegImageInput::getWidth() const
+JpegInput::getWidth() const
{
assert(_compressorOpened);
return m_cinfo.output_width;
@@ -413,7 +413,7 @@ JpegImageInput::getWidth() const
size_t
-JpegImageInput::getComponents() const
+JpegInput::getComponents() const
{
assert(_compressorOpened);
return m_cinfo.output_components;
@@ -421,7 +421,7 @@ JpegImageInput::getComponents() const
void
-JpegImageInput::readScanline(unsigned char* rgb_data)
+JpegInput::readScanline(unsigned char* rgb_data)
{
assert(_compressorOpened);
assert(m_cinfo.output_scanline < m_cinfo.output_height);
@@ -444,7 +444,7 @@ JpegImageInput::readScanline(unsigned char* rgb_data)
void
-JpegImageInput::errorOccurred(const char* msg)
+JpegInput::errorOccurred(const char* msg)
{
log_debug("Long jump: banzaaaaaai!");
_errorOccurred = msg;
@@ -460,7 +460,7 @@ JpegImageInput::errorOccurred(const char* msg)
// already has tables loaded. The IJG documentation describes
// this as "abbreviated" format.
std::auto_ptr<GnashImage>
-JpegImageInput::readSWFJpeg2WithTables(JpegImageInput& loader)
+JpegInput::readSWFJpeg2WithTables(JpegInput& loader)
{
loader.read();
@@ -569,7 +569,7 @@ public:
private:
- // Source stream, owned in this context by JpegImageInput
+ // Source stream, owned in this context by JpegInput
IOChannel& m_out_stream;
JOCTET m_buffer[IO_BUF_SIZE]; /* start of buffer */
diff --git a/libbase/GnashImageJpeg.h b/libbase/GnashImageJpeg.h
index 403284a..267ba5d 100644
--- a/libbase/GnashImageJpeg.h
+++ b/libbase/GnashImageJpeg.h
@@ -51,7 +51,7 @@ namespace image {
/// Class for reading JPEG image data.
//
/// This uses the IJG jpeglib to implement the ImageInput interface.
-class JpegImageInput : public ImageInput
+class JpegInput : public ImageInput
{
private:
@@ -68,12 +68,12 @@ private:
public:
- /// Construct a JpegImageInput object to read from an IOChannel.
+ /// Construct a JpegInput object to read from an IOChannel.
//
/// @param in The stream to read JPEG data from. Ownership is shared
- /// between caller and JpegImageInput, so it is freed
+ /// between caller and JpegInput, so it is freed
/// automatically when the last owner is destroyed.
- DSOEXPORT JpegImageInput(boost::shared_ptr<IOChannel> in);
+ DSOEXPORT JpegInput(boost::shared_ptr<IOChannel> in);
/// Read the JPEG header information only.
//
@@ -82,7 +82,7 @@ public:
/// early.
void DSOEXPORT readHeader(unsigned int maxHeaderBytes);
- ~JpegImageInput();
+ ~JpegInput();
/// Begin processing the image data.
void read();
@@ -120,12 +120,12 @@ public:
/// @param rgbData The buffer for writing raw RGB data to.
void readScanline(unsigned char* rgbData);
- /// Create a JpegImageInput and transfer ownership to the caller.
+ /// Create a JpegInput and transfer ownership to the caller.
//
/// @param in The IOChannel to read JPEG data from.
static std::auto_ptr<ImageInput> create(boost::shared_ptr<IOChannel> in)
{
- std::auto_ptr<ImageInput> ret(new JpegImageInput(in));
+ std::auto_ptr<ImageInput> ret(new JpegInput(in));
// might throw an exception (I guess)
if (ret.get()) ret->read();
return ret;
@@ -135,11 +135,11 @@ public:
/// For reading SWF JPEG2-style image data, using pre-loaded
/// headers stored in the given jpeg::input object.
//
- /// @param loader The JpegImageInput object to use for reading the
+ /// @param loader The JpegInput object to use for reading the
/// data. This should have been constructed with
/// createSWFJpeg2HeaderOnly().
DSOEXPORT static std::auto_ptr<GnashImage> readSWFJpeg2WithTables(
- JpegImageInput& loader);
+ JpegInput& loader);
/// Create a JPEG 'loader' object by reading a JPEG header.
//
@@ -147,10 +147,10 @@ public:
//
/// @param in The channel to read JPEG header data from.
/// @param maxHeaderBytes The maximum number of bytes to read.
- static std::auto_ptr<JpegImageInput> createSWFJpeg2HeaderOnly(
+ static std::auto_ptr<JpegInput> createSWFJpeg2HeaderOnly(
boost::shared_ptr<IOChannel> in, unsigned int maxHeaderBytes)
{
- std::auto_ptr<JpegImageInput> ret (new JpegImageInput(in));
+ std::auto_ptr<JpegInput> ret (new JpegInput(in));
// might throw an exception
if (ret.get()) ret->readHeader(maxHeaderBytes);
return ret;
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 7966349..69558bd 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -72,7 +72,7 @@ flushData(png_structp /*pngptr*/)
} // unnamed namespace
-PngImageInput::PngImageInput(boost::shared_ptr<IOChannel> in) :
+PngInput::PngInput(boost::shared_ptr<IOChannel> in) :
ImageInput(in),
_pngPtr(0),
_infoPtr(0),
@@ -83,34 +83,34 @@ PngImageInput::PngImageInput(boost::shared_ptr<IOChannel>
in) :
init();
}
-PngImageInput::~PngImageInput()
+PngInput::~PngInput()
{
png_destroy_read_struct(&_pngPtr, &_infoPtr,
static_cast<png_infopp>(NULL));
}
size_t
-PngImageInput::getHeight() const
+PngInput::getHeight() const
{
assert (_pngPtr && _infoPtr);
return png_get_image_height(_pngPtr, _infoPtr);
}
size_t
-PngImageInput::getWidth() const
+PngInput::getWidth() const
{
assert (_pngPtr && _infoPtr);
return png_get_image_width(_pngPtr, _infoPtr);
}
size_t
-PngImageInput::getComponents() const
+PngInput::getComponents() const
{
return png_get_channels(_pngPtr, _infoPtr);
}
void
-PngImageInput::readScanline(unsigned char* imageData)
+PngInput::readScanline(unsigned char* imageData)
{
assert (_currentRow < getHeight());
assert (_rowPtrs);
@@ -125,7 +125,7 @@ PngImageInput::readScanline(unsigned char* imageData)
void
-PngImageInput::init()
+PngInput::init()
{
// Initialize png library.
_pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
@@ -144,7 +144,7 @@ PngImageInput::init()
}
void
-PngImageInput::read()
+PngInput::read()
{
// Set our user-defined reader function
png_set_read_fn(_pngPtr, _inStream.get(), &readData);
diff --git a/libbase/GnashImagePng.h b/libbase/GnashImagePng.h
index c3ff8f9..9230618 100644
--- a/libbase/GnashImagePng.h
+++ b/libbase/GnashImagePng.h
@@ -44,19 +44,19 @@ namespace gnash {
namespace gnash {
namespace image {
-class PngImageInput : public ImageInput
+class PngInput : public ImageInput
{
public:
- /// Construct a PngImageInput object to read from an IOChannel.
+ /// Construct a PngInput object to read from an IOChannel.
//
/// @param in The stream to read PNG data from. Ownership is shared
- /// between caller and JpegImageInput, so it is freed
+ /// between caller and JpegInput, so it is freed
/// automatically when the last owner is destroyed.
- PngImageInput(boost::shared_ptr<IOChannel> in);
+ PngInput(boost::shared_ptr<IOChannel> in);
- ~PngImageInput();
+ ~PngInput();
/// Begin processing the image data.
void read();
@@ -78,13 +78,13 @@ public:
/// @param rgbData The buffer for writing raw RGB data to.
void readScanline(unsigned char* imageData);
- /// Create a PngImageInput and transfer ownership to the caller.
+ /// Create a PngInput and transfer ownership to the caller.
//
/// @param in The IOChannel to read PNG data from.
DSOEXPORT static std::auto_ptr<ImageInput> create(
boost::shared_ptr<IOChannel> in)
{
- std::auto_ptr<ImageInput> ret ( new PngImageInput(in) );
+ std::auto_ptr<ImageInput> ret ( new PngInput(in) );
if (ret.get()) ret->read();
return ret;
}
diff --git a/libcore/parser/SWFMovieDefinition.h
b/libcore/parser/SWFMovieDefinition.h
index 8ea8fc1..d94e283 100644
--- a/libcore/parser/SWFMovieDefinition.h
+++ b/libcore/parser/SWFMovieDefinition.h
@@ -292,7 +292,7 @@ public:
/// Set an input object for later loading DefineBits
/// images (JPEG images without the table info).
- void set_jpeg_loader(std::auto_ptr<image::JpegImageInput> j_in) {
+ void set_jpeg_loader(std::auto_ptr<image::JpegInput> j_in) {
if (m_jpeg_in.get()) {
/// There should be only one JPEGTABLES tag in an SWF (see:
/// http://www.m2osw.com/en/swf_alexref.html#tag_jpegtables)
@@ -308,7 +308,7 @@ public:
}
// See dox in movie_definition.h
- image::JpegImageInput* get_jpeg_loader() const {
+ image::JpegInput* get_jpeg_loader() const {
return m_jpeg_in.get();
}
@@ -496,7 +496,7 @@ private:
boost::uint32_t m_file_length;
- std::auto_ptr<image::JpegImageInput> m_jpeg_in;
+ std::auto_ptr<image::JpegInput> m_jpeg_in;
std::string _url;
diff --git a/libcore/parser/movie_definition.h
b/libcore/parser/movie_definition.h
index 12da696..ef6fce0 100644
--- a/libcore/parser/movie_definition.h
+++ b/libcore/parser/movie_definition.h
@@ -73,7 +73,7 @@ namespace gnash {
class Font;
class sound_sample;
namespace image {
- class JpegImageInput;
+ class JpegInput;
}
}
@@ -309,7 +309,7 @@ public:
/// *is* performed, and it is deleting the jpeg::input instance since
/// it is passed in an auto_ptr...
///
- virtual void set_jpeg_loader(std::auto_ptr<image::JpegImageInput>
/*j_in*/)
+ virtual void set_jpeg_loader(std::auto_ptr<image::JpegInput> /*j_in*/)
{
}
@@ -324,7 +324,7 @@ public:
///
/// NOTE: ownership of the returned object is NOT transferred
///
- virtual image::JpegImageInput* get_jpeg_loader() const
+ virtual image::JpegInput* get_jpeg_loader() const
{
return NULL;
}
diff --git a/libcore/swf/tag_loaders.cpp b/libcore/swf/tag_loaders.cpp
index 4c77440..f57a59e 100644
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -239,7 +239,7 @@ jpeg_tables_loader(SWFStream& in, TagType tag,
movie_definition& m,
currPos);
}
- std::auto_ptr<image::JpegImageInput> input;
+ std::auto_ptr<image::JpegInput> input;
try
{
@@ -252,8 +252,8 @@ jpeg_tables_loader(SWFStream& in, TagType tag,
movie_definition& m,
//
boost::shared_ptr<IOChannel> ad(StreamAdapter::getFile(in,
std::numeric_limits<std::streamsize>::max()).release());
- // transfer ownership to the image::JpegImageInput
- input = image::JpegImageInput::createSWFJpeg2HeaderOnly(ad,
jpegHeaderSize);
+ // transfer ownership to the image::JpegInput
+ input = image::JpegInput::createSWFJpeg2HeaderOnly(ad, jpegHeaderSize);
}
catch (std::exception& e)
@@ -271,7 +271,7 @@ jpeg_tables_loader(SWFStream& in, TagType tag,
movie_definition& m,
// A JPEG image without included tables; those should be in an
-// existing image::JpegImageInput object stored in the movie.
+// existing image::JpegInput object stored in the movie.
void
define_bits_jpeg_loader(SWFStream& in, TagType tag, movie_definition& m,
const RunResources& r)
@@ -291,7 +291,7 @@ define_bits_jpeg_loader(SWFStream& in, TagType tag,
movie_definition& m,
}
// Read the image data.
- image::JpegImageInput* j_in = m.get_jpeg_loader();
+ image::JpegInput* j_in = m.get_jpeg_loader();
if ( ! j_in )
{
IF_VERBOSE_MALFORMED_SWF(
@@ -305,7 +305,7 @@ define_bits_jpeg_loader(SWFStream& in, TagType tag,
movie_definition& m,
std::auto_ptr<image::GnashImage> im;
try {
- im = image::JpegImageInput::readSWFJpeg2WithTables(*j_in);
+ im = image::JpegInput::readSWFJpeg2WithTables(*j_in);
}
catch (std::exception& e) {
IF_VERBOSE_MALFORMED_SWF(
http://git.savannah.gnu.org/cgit//commit/?id=05eef2413e8c30361250460e5eecbc68dc6e4424
commit 05eef2413e8c30361250460e5eecbc68dc6e4424
Author: Benjamin Wolsey <address@hidden>
Date: Mon Aug 30 13:39:14 2010 +0200
Rename image type enum.
diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
index df925cf..0f6a03b 100644
--- a/libbase/GnashImage.cpp
+++ b/libbase/GnashImage.cpp
@@ -89,7 +89,7 @@ GnashImage::update(const GnashImage& from)
ImageRGB::ImageRGB(size_t width, size_t height)
:
- GnashImage(width, height, GNASH_IMAGE_RGB)
+ GnashImage(width, height, TYPE_RGB)
{
}
@@ -99,7 +99,7 @@ ImageRGB::~ImageRGB()
ImageRGBA::ImageRGBA(size_t width, size_t height)
:
- GnashImage(width, height, GNASH_IMAGE_RGBA)
+ GnashImage(width, height, TYPE_RGBA)
{
}
@@ -177,10 +177,10 @@ ImageOutput::writeImageData(FileType type,
}
switch (image.type()) {
- case GNASH_IMAGE_RGB:
+ case TYPE_RGB:
outChannel->writeImageRGB(image.begin());
break;
- case GNASH_IMAGE_RGBA:
+ case TYPE_RGBA:
outChannel->writeImageRGBA(image.begin());
break;
default:
@@ -221,10 +221,10 @@ ImageInput::readImageData(boost::shared_ptr<IOChannel>
in, FileType type)
try {
switch (inChannel->imageType()) {
- case GNASH_IMAGE_RGB:
+ case TYPE_RGB:
im.reset(new ImageRGB(width, height));
break;
- case GNASH_IMAGE_RGBA:
+ case TYPE_RGBA:
im.reset(new ImageRGBA(width, height));
break;
default:
@@ -250,7 +250,7 @@ ImageInput::readImageData(boost::shared_ptr<IOChannel> in,
FileType type)
// never transparent, but the addition of alpha data stored elsewhere
// in the SWF is possible; in that case, the processing happens during
// mergeAlpha().
- if (im->type() == GNASH_IMAGE_RGBA) {
+ if (im->type() == TYPE_RGBA) {
processAlpha(im->begin(), width * height);
}
return im;
diff --git a/libbase/GnashImage.h b/libbase/GnashImage.h
index c032a09..151594f 100644
--- a/libbase/GnashImage.h
+++ b/libbase/GnashImage.h
@@ -49,8 +49,8 @@ namespace image {
enum ImageType
{
GNASH_IMAGE_INVALID,
- GNASH_IMAGE_RGB,
- GNASH_IMAGE_RGBA
+ TYPE_RGB,
+ TYPE_RGBA
};
/// The locations of images handled in Gnash.
@@ -64,9 +64,9 @@ inline size_t
numChannels(ImageType t)
{
switch (t) {
- case GNASH_IMAGE_RGBA:
+ case TYPE_RGBA:
return 4;
- case GNASH_IMAGE_RGB:
+ case TYPE_RGB:
return 3;
default:
std::abort();
@@ -226,7 +226,7 @@ public:
/// Create an ImageRGB taking ownership of the data.
ImageRGB(iterator data, size_t width, size_t height)
:
- GnashImage(data, width, height, GNASH_IMAGE_RGB)
+ GnashImage(data, width, height, TYPE_RGB)
{}
virtual ~ImageRGB();
@@ -245,7 +245,7 @@ public:
ImageRGBA(iterator data, size_t width, size_t height)
:
- GnashImage(data, width, height, GNASH_IMAGE_RGBA)
+ GnashImage(data, width, height, TYPE_RGBA)
{}
~ImageRGBA();
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index e5f25ad..9927652 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -213,7 +213,7 @@ GifImageInput::read()
// Set the type to RGB
// TODO: implement RGBA!
- _type = GNASH_IMAGE_RGB;
+ _type = TYPE_RGB;
}
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index 783826a..e8ff5e1 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -374,7 +374,7 @@ JpegImageInput::read()
// Until this point the type should be GNASH_IMAGE_INVALID.
// It's possible to create transparent JPEG data by merging an
// alpha channel, but that is handled explicitly elsewhere.
- _type = GNASH_IMAGE_RGB;
+ _type = TYPE_RGB;
}
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 1cf1292..7966349 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -170,7 +170,7 @@ PngImageInput::read()
if (png_get_valid(_pngPtr, _infoPtr, PNG_INFO_tRNS)) {
log_debug("Applying transparency block, image is RGBA");
png_set_tRNS_to_alpha(_pngPtr);
- _type = GNASH_IMAGE_RGBA;
+ _type = TYPE_RGBA;
}
// Make 16-bit data into 8-bit data
@@ -182,12 +182,12 @@ PngImageInput::read()
if (type & PNG_COLOR_MASK_ALPHA)
{
log_debug("Loading PNG image with alpha");
- _type = GNASH_IMAGE_RGBA;
+ _type = TYPE_RGBA;
}
else
{
log_debug("Loading PNG image without alpha");
- _type = GNASH_IMAGE_RGB;
+ _type = TYPE_RGB;
}
}
@@ -206,8 +206,8 @@ PngImageInput::read()
const size_t components = getComponents();
// We must have 3 or 4-channel data by this point.
- assert((_type == GNASH_IMAGE_RGB && components == 3) ||
- (_type == GNASH_IMAGE_RGBA && components == 4));
+ assert((_type == TYPE_RGB && components == 3) ||
+ (_type == TYPE_RGBA && components == 4));
// Allocate space for the data
_pixelData.reset(new png_byte[width * height * components]);
diff --git a/libbase/GnashTexture.cpp b/libbase/GnashTexture.cpp
index d6b896e..7b9f0a1 100644
--- a/libbase/GnashTexture.cpp
+++ b/libbase/GnashTexture.cpp
@@ -119,11 +119,11 @@ static bool check_extension(const char *name, const char
*ext)
GnashTextureFormat::GnashTextureFormat(image::ImageType type)
{
switch (type) {
- case image::GNASH_IMAGE_RGB:
+ case image::TYPE_RGB:
_internal_format = GL_RGB;
_format = GL_RGB;
break;
- case image::GNASH_IMAGE_RGBA:
+ case image::TYPE_RGBA:
_internal_format = GL_RGBA;
_format = GL_BGRA;
break;
diff --git a/libbase/ImageIterators.h b/libbase/ImageIterators.h
index ab061cf..15290c5 100644
--- a/libbase/ImageIterators.h
+++ b/libbase/ImageIterators.h
@@ -50,9 +50,9 @@ public:
/// Underlying bytes are really in RGBA order, so we use that.
const ARGB& operator=(const ARGB& other) const {
switch (_t) {
- case GNASH_IMAGE_RGBA:
+ case TYPE_RGBA:
// RGBA to RGBA
- if (other._t == GNASH_IMAGE_RGBA) {
+ if (other._t == TYPE_RGBA) {
std::copy(other._it, other._it + 4, _it);
break;
}
@@ -62,7 +62,7 @@ public:
*(_it + 3) = 0xff;
break;
- case GNASH_IMAGE_RGB:
+ case TYPE_RGB:
// It doesn't matter what the other image is.
std::copy(other._it, other._it + 3, _it);
@@ -77,10 +77,10 @@ public:
/// Take note of the different byte order!
const ARGB& operator=(boost::uint32_t pixel) const {
switch (_t) {
- case GNASH_IMAGE_RGBA:
+ case TYPE_RGBA:
// alpha
*(_it + 3) = (pixel & 0xff000000) >> 24;
- case GNASH_IMAGE_RGB:
+ case TYPE_RGB:
*_it = (pixel & 0x00ff0000) >> 16;
*(_it + 1) = (pixel & 0x0000ff00) >> 8;
*(_it + 2) = (pixel & 0x000000ff);
@@ -94,10 +94,10 @@ public:
operator boost::uint32_t() const {
boost::uint32_t ret = 0xff000000;
switch (_t) {
- case GNASH_IMAGE_RGBA:
+ case TYPE_RGBA:
// alpha
ret = *(_it + 3) << 24;
- case GNASH_IMAGE_RGB:
+ case TYPE_RGB:
ret |= (*_it << 16 | *(_it + 1) << 8 | *(_it + 2));
default:
break;
diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp
b/libcore/asobj/flash/display/BitmapData_as.cpp
index 51d7800..e345d3f 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -812,7 +812,7 @@ bitmapdata_loadBitmap(const fn_call& fn)
}
std::auto_ptr<image::GnashImage> newImage;
- if (im.type() == image::GNASH_IMAGE_RGBA) {
+ if (im.type() == image::TYPE_RGBA) {
newImage.reset(new image::ImageRGBA(width, height));
}
else {
diff --git a/libcore/asobj/flash/display/BitmapData_as.h
b/libcore/asobj/flash/display/BitmapData_as.h
index fb43d47..fdb3cbe 100644
--- a/libcore/asobj/flash/display/BitmapData_as.h
+++ b/libcore/asobj/flash/display/BitmapData_as.h
@@ -84,7 +84,7 @@ public:
bool transparent() const {
assert(data());
- return (data()->type() == image::GNASH_IMAGE_RGBA);
+ return (data()->type() == image::TYPE_RGBA);
}
const CachedBitmap* bitmapInfo() const {
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
index 947dbf9..0552883 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
@@ -263,7 +263,7 @@ VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
im.reset();
return im;
}
- im.reset(new GnashVaapiImage(vaSurface->get(),
image::GNASH_IMAGE_RGBA));
+ im.reset(new GnashVaapiImage(vaSurface->get(), image::TYPE_RGBA));
return im;
}
#endif
diff --git a/librender/Renderer_agg.cpp b/librender/Renderer_agg.cpp
index cfec14c..6794be0 100644
--- a/librender/Renderer_agg.cpp
+++ b/librender/Renderer_agg.cpp
@@ -799,10 +799,10 @@ public:
switch (frame->type())
{
- case image::GNASH_IMAGE_RGBA:
+ case image::TYPE_RGBA:
renderVideo<agg::pixfmt_rgba32_pre>(*frame, mtx, path, smooth);
break;
- case image::GNASH_IMAGE_RGB:
+ case image::TYPE_RGB:
renderVideo<agg::pixfmt_rgb24_pre>(*frame, mtx, path, smooth);
break;
default:
@@ -889,17 +889,17 @@ public:
std::auto_ptr<Renderer_agg_base> in;
switch (im.type()) {
- case image::GNASH_IMAGE_RGB:
+ case image::TYPE_RGB:
in.reset(new Renderer_agg<typename RGB::PixelFormat>(24));
break;
- case image::GNASH_IMAGE_RGBA:
+ case image::TYPE_RGBA:
in.reset(new Renderer_agg<typename RGBA::PixelFormat>(32));
break;
}
const size_t width = im.width();
const size_t height = im.height();
- const size_t stride = width * (im.type() == image::GNASH_IMAGE_RGBA ?
4 : 3);
+ const size_t stride = width * (im.type() == image::TYPE_RGBA ? 4 : 3);
in->init_buffer(im.begin(), width * height, width, height, stride);
_external.reset(in.release());
diff --git a/librender/Renderer_agg_bitmap.h b/librender/Renderer_agg_bitmap.h
index 291b8ca..03bb68f 100644
--- a/librender/Renderer_agg_bitmap.h
+++ b/librender/Renderer_agg_bitmap.h
@@ -32,7 +32,7 @@ public:
agg_bitmap_info(std::auto_ptr<image::GnashImage> im)
:
_image(im.release()),
- _bpp(_image->type() == image::GNASH_IMAGE_RGB ? 24 : 32)
+ _bpp(_image->type() == image::TYPE_RGB ? 24 : 32)
{
}
diff --git a/librender/Renderer_cairo.cpp b/librender/Renderer_cairo.cpp
index f32540d..9d9bab0 100644
--- a/librender/Renderer_cairo.cpp
+++ b/librender/Renderer_cairo.cpp
@@ -462,7 +462,7 @@
Renderer_cairo::createCachedBitmap(std::auto_ptr<image::GnashImage> im)
switch (im->type())
{
- case image::GNASH_IMAGE_RGB:
+ case image::TYPE_RGB:
{
rgb_to_cairo_rgb24(buffer, im.get());
@@ -470,7 +470,7 @@
Renderer_cairo::createCachedBitmap(std::auto_ptr<image::GnashImage> im)
CAIRO_FORMAT_RGB24);
}
- case image::GNASH_IMAGE_RGBA:
+ case image::TYPE_RGBA:
{
rgba_to_cairo_argb(buffer, im.get());
@@ -488,7 +488,7 @@ Renderer_cairo::drawVideoFrame(image::GnashImage*
baseframe, const Transform& xf
const SWFRect* bounds, bool /*smooth*/)
{
- if (baseframe->type() == image::GNASH_IMAGE_RGBA)
+ if (baseframe->type() == image::TYPE_RGBA)
{
LOG_ONCE(log_error(_("Can't render videos with alpha")));
return;
diff --git a/librender/Renderer_ogl.cpp b/librender/Renderer_ogl.cpp
index 6c88c0d..f39cceb 100644
--- a/librender/Renderer_ogl.cpp
+++ b/librender/Renderer_ogl.cpp
@@ -787,7 +787,7 @@ public:
virtual CachedBitmap* createCachedBitmap(std::auto_ptr<image::GnashImage> im)
{
switch (im->type()) {
- case image::GNASH_IMAGE_RGB:
+ case image::TYPE_RGB:
{
std::auto_ptr<image::GnashImage> rgba(
new image::ImageRGBA(im->width(), im->height()));
@@ -799,7 +799,7 @@ public:
}
im = rgba;
}
- case image::GNASH_IMAGE_RGBA:
+ case image::TYPE_RGBA:
return new bitmap_info_ogl(im, GL_RGBA, ogl_accessible());
default:
std::abort();
http://git.savannah.gnu.org/cgit//commit/?id=d605216a285e7d4abda558938de49e8641d43404
commit d605216a285e7d4abda558938de49e8641d43404
Author: Benjamin Wolsey <address@hidden>
Date: Mon Aug 30 13:35:47 2010 +0200
Add image namespace, move mergeAlpha out of class.
diff --git a/libbase/CachedBitmap.h b/libbase/CachedBitmap.h
index 20325ca..76f5991 100644
--- a/libbase/CachedBitmap.h
+++ b/libbase/CachedBitmap.h
@@ -25,7 +25,9 @@
namespace gnash {
-class GnashImage;
+namespace image {
+ class GnashImage;
+}
/// A CachedBitmap is created by the renderer in a format of its choosing.
//
@@ -43,7 +45,7 @@ public:
/// Return a GnashImage for manipulation.
//
/// The changes to the data must be cached before the next rendering.
- virtual GnashImage& image() = 0;
+ virtual image::GnashImage& image() = 0;
/// Free the memory associated with this CachedBitmap.
//
diff --git a/libbase/GnashImage.cpp b/libbase/GnashImage.cpp
index 4822af4..df925cf 100644
--- a/libbase/GnashImage.cpp
+++ b/libbase/GnashImage.cpp
@@ -37,8 +37,8 @@
#include "IOChannel.h"
#include "log.h"
-namespace gnash
-{
+namespace gnash {
+namespace image {
namespace {
void processAlpha(GnashImage::iterator imageData, size_t pixels);
@@ -124,12 +124,13 @@ ImageRGBA::setPixel(size_t x, size_t y, value_type r,
value_type g,
void
-ImageRGBA::mergeAlpha(const_iterator alphaData, const size_t bufferLength)
+mergeAlpha(ImageRGBA& im, GnashImage::const_iterator alphaData,
+ const size_t bufferLength)
{
- assert(bufferLength * 4 <= size());
+ assert(bufferLength * 4 <= im.size());
// Point to the first alpha byte
- iterator p = begin();
+ GnashImage::iterator p = im.begin();
// Premultiplication is also done at rendering time (at least by the
// agg renderer).
@@ -313,6 +314,6 @@ processAlpha(GnashImage::iterator imageData, size_t pixels)
}
} // anonymous namespace
-
+} // namespace image
} // namespace gnash
diff --git a/libbase/GnashImage.h b/libbase/GnashImage.h
index d93b22b..c032a09 100644
--- a/libbase/GnashImage.h
+++ b/libbase/GnashImage.h
@@ -42,6 +42,9 @@ namespace gnash {
namespace gnash {
+/// Image handling functions and classes.
+namespace image {
+
/// The types of images handled in Gnash.
enum ImageType
{
@@ -253,9 +256,6 @@ public:
///
void setPixel(size_t x, size_t y, value_type r, value_type g, value_type b,
value_type a);
-
- void mergeAlpha(const_iterator alphaData, const size_t bufferLength);
-
};
/// The base class for reading image data.
@@ -407,6 +407,10 @@ scanline(const GnashImage& im, size_t row)
return im.begin() + im.stride() * row;
}
+void mergeAlpha(ImageRGBA& im, GnashImage::const_iterator alphaData,
+ const size_t bufferLength);
+
+} // namespace image
} // namespace gnash
#endif
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index 3e2b69b..e5f25ad 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -33,6 +33,7 @@ extern "C" {
}
namespace gnash {
+namespace image {
static int
readData(GifFileType* ft, GifByteType* data, int length)
@@ -216,6 +217,7 @@ GifImageInput::read()
}
+} // namespace image
} // namespace gnash
// Local Variables:
diff --git a/libbase/GnashImageGif.h b/libbase/GnashImageGif.h
index e1fec0f..38baf40 100644
--- a/libbase/GnashImageGif.h
+++ b/libbase/GnashImageGif.h
@@ -36,6 +36,7 @@ extern "C" {
namespace gnash { class IOChannel; }
namespace gnash {
+namespace image {
class GifImageInput : public ImageInput
{
@@ -108,6 +109,7 @@ private:
};
+} // namespace image
} // namespace gnash
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index 056c060..783826a 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -61,8 +61,8 @@ typedef jpeg_boolean jpeg_bool_t;
typedef jpeg::boolean jpeg_bool_t;
#endif
-namespace gnash
-{
+namespace gnash {
+namespace image {
static void
jpeg_error_exit(j_common_ptr cinfo)
@@ -630,6 +630,7 @@ JpegImageOutput::create(boost::shared_ptr<IOChannel> out,
size_t width,
return outChannel;
}
+} // namespace image
} // namespace gnash
diff --git a/libbase/GnashImageJpeg.h b/libbase/GnashImageJpeg.h
index 3288f37..403284a 100644
--- a/libbase/GnashImageJpeg.h
+++ b/libbase/GnashImageJpeg.h
@@ -45,8 +45,8 @@ extern "C" {
// Forward declarations
namespace gnash { class IOChannel; }
-namespace gnash
-{
+namespace gnash {
+namespace image {
/// Class for reading JPEG image data.
//
@@ -205,9 +205,9 @@ private:
};
+} // namespace image
} // namespace gnash
-
#endif // JPEG_H
// Local Variables:
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index a2b4dac..1cf1292 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -29,8 +29,11 @@
#include <boost/scoped_array.hpp>
namespace gnash {
+namespace image {
-static void
+namespace {
+
+void
error(png_struct*, const char* msg)
{
std::ostringstream ss;
@@ -38,13 +41,13 @@ error(png_struct*, const char* msg)
throw ParserException(ss.str());
}
-static void
+void
warning(png_struct*, const char* msg)
{
log_debug(_("PNG warning: %s"), msg);
}
-static void
+void
readData(png_structp pngptr, png_bytep data, png_size_t length)
{
// Do not call unless the PNG exists.
@@ -53,7 +56,7 @@ readData(png_structp pngptr, png_bytep data, png_size_t
length)
in->read(reinterpret_cast<char*>(data), length);
}
-static void
+void
writeData(png_structp pngptr, png_bytep data, png_size_t length)
{
// Do not call unless the PNG exists.
@@ -62,12 +65,13 @@ writeData(png_structp pngptr, png_bytep data, png_size_t
length)
out->write(reinterpret_cast<char*>(data), length);
}
-static void
+void
flushData(png_structp /*pngptr*/)
{
-
}
+} // unnamed namespace
+
PngImageInput::PngImageInput(boost::shared_ptr<IOChannel> in) :
ImageInput(in),
_pngPtr(0),
@@ -321,7 +325,7 @@ PngImageOutput::create(boost::shared_ptr<IOChannel> out,
size_t width,
return outChannel;
}
-
+} // namespace image
} // namespace gnash
// Local Variables:
diff --git a/libbase/GnashImagePng.h b/libbase/GnashImagePng.h
index 2650de6..c3ff8f9 100644
--- a/libbase/GnashImagePng.h
+++ b/libbase/GnashImagePng.h
@@ -37,9 +37,12 @@ extern "C" {
}
// Forward declarations
-namespace gnash { class IOChannel; }
+namespace gnash {
+ class IOChannel;
+}
namespace gnash {
+namespace image {
class PngImageInput : public ImageInput
{
@@ -139,6 +142,7 @@ private:
};
+} // namespace image
} // namespace gnash
diff --git a/libbase/GnashTexture.cpp b/libbase/GnashTexture.cpp
index dcd0be1..d6b896e 100644
--- a/libbase/GnashTexture.cpp
+++ b/libbase/GnashTexture.cpp
@@ -116,25 +116,31 @@ static bool check_extension(const char *name, const char
*ext)
return false;
}
-GnashTextureFormat::GnashTextureFormat(ImageType type)
+GnashTextureFormat::GnashTextureFormat(image::ImageType type)
{
switch (type) {
- case GNASH_IMAGE_RGB:
- _internal_format = GL_RGB;
- _format = GL_RGB;
- break;
- case GNASH_IMAGE_RGBA:
- _internal_format = GL_RGBA;
- _format = GL_BGRA;
- break;
- default:
- assert(0);
- break;
+ case image::GNASH_IMAGE_RGB:
+ _internal_format = GL_RGB;
+ _format = GL_RGB;
+ break;
+ case image::GNASH_IMAGE_RGBA:
+ _internal_format = GL_RGBA;
+ _format = GL_BGRA;
+ break;
+ default:
+ assert(0);
+ break;
}
}
-GnashTexture::GnashTexture(unsigned int width, unsigned int height, ImageType
type)
- : _width(width), _height(height), _texture(0), _format(type), _flags(0)
+GnashTexture::GnashTexture(unsigned int width, unsigned int height,
+ image::ImageType type)
+ :
+ _width(width),
+ _height(height),
+ _texture(0),
+ _format(type),
+ _flags(0)
{
D(bug("GnashTexture::GnashTexture()\n"));
diff --git a/libbase/GnashTexture.h b/libbase/GnashTexture.h
index 1bcb3ee..267d375 100644
--- a/libbase/GnashTexture.h
+++ b/libbase/GnashTexture.h
@@ -36,7 +36,7 @@ class DSOEXPORT GnashTextureFormat {
unsigned int _format;
public:
- GnashTextureFormat(ImageType type);
+ GnashTextureFormat(image::ImageType type);
/// Return GL internal format
unsigned int internal_format() const
@@ -68,7 +68,8 @@ private:
bool init();
public:
- GnashTexture(unsigned int width, unsigned int height, ImageType type);
+ GnashTexture(unsigned int width, unsigned int height,
+ image::ImageType type);
virtual ~GnashTexture();
/// Return texture flags
diff --git a/libbase/GnashVaapiImage.cpp b/libbase/GnashVaapiImage.cpp
index 0be1fd0..d23f73a 100644
--- a/libbase/GnashVaapiImage.cpp
+++ b/libbase/GnashVaapiImage.cpp
@@ -39,11 +39,13 @@ static boost::uint64_t get_ticks_usec(void)
#endif
}
-GnashVaapiImage::GnashVaapiImage(boost::shared_ptr<VaapiSurface> surface,
ImageType type)
- : GnashImage(NULL, surface->width(), surface->height(), type,
- GNASH_IMAGE_GPU)
- , _surface(surface)
- , _creation_time(get_ticks_usec())
+GnashVaapiImage::GnashVaapiImage(boost::shared_ptr<VaapiSurface> surface,
+ image::ImageType type)
+ :
+ image::GnashImage(NULL, surface->width(), surface->height(), type,
+ image::GNASH_IMAGE_GPU),
+ _surface(surface),
+ _creation_time(get_ticks_usec())
{
log_debug("GnashVaapiImage::GnashVaapiImage(): surface 0x%08x, size
%dx%d\n",
_surface->get(), _width, _height);
@@ -69,22 +71,22 @@ void GnashVaapiImage::update(boost::uint8_t* data)
_creation_time = get_ticks_usec();
}
-void GnashVaapiImage::update(const GnashImage& from)
+void GnashVaapiImage::update(const image::GnashImage& from)
{
assert(stride() == from.stride());
assert(size() <= from.size());
assert(type() == from.type());
switch (from.location()) {
- case GNASH_IMAGE_CPU:
- this->update(const_cast<boost::uint8_t *>(from.begin()));
- break;
- case GNASH_IMAGE_GPU:
- this->update(static_cast<const GnashVaapiImage &>(from).surface());
- break;
- default:
- assert(0);
- break;
+ case image::GNASH_IMAGE_CPU:
+ this->update(const_cast<boost::uint8_t*>(from.begin()));
+ break;
+ case image::GNASH_IMAGE_GPU:
+ this->update(static_cast<const GnashVaapiImage&>(from).surface());
+ break;
+ default:
+ assert(0);
+ break;
}
}
@@ -103,7 +105,7 @@ bool GnashVaapiImage::transfer()
}
// Get access to the underlying data
-GnashImage::iterator
+image::GnashImage::iterator
GnashVaapiImage::begin()
{
log_debug("GnashVaapiImage::data(): surface 0x%08x\n", _surface->get());
@@ -118,7 +120,7 @@ GnashVaapiImage::begin()
}
// Get read-only access to the underlying data
-GnashImage::const_iterator
+image::GnashImage::const_iterator
GnashVaapiImage::begin() const
{
log_debug("GnashVaapiImage::data() const: surface 0x%08x\n",
_surface->get());
diff --git a/libbase/GnashVaapiImage.h b/libbase/GnashVaapiImage.h
index 4011328..ae65b84 100644
--- a/libbase/GnashVaapiImage.h
+++ b/libbase/GnashVaapiImage.h
@@ -30,7 +30,7 @@ class VaapiSurface;
class VaapiSurfaceProxy;
/// GnashImage implementation using a VA surface
-class DSOEXPORT GnashVaapiImage : public GnashImage
+class DSOEXPORT GnashVaapiImage : public image::GnashImage
{
boost::shared_ptr<VaapiSurface> _surface;
boost::uint64_t _creation_time;
@@ -39,13 +39,14 @@ class DSOEXPORT GnashVaapiImage : public GnashImage
bool transfer();
public:
- GnashVaapiImage(boost::shared_ptr<VaapiSurface> surface, ImageType type);
+ GnashVaapiImage(boost::shared_ptr<VaapiSurface> surface,
+ image::ImageType type);
GnashVaapiImage(const GnashVaapiImage& o);
~GnashVaapiImage();
virtual void update(boost::shared_ptr<VaapiSurface> surface);
virtual void update(boost::uint8_t* data);
- virtual void update(const GnashImage& from);
+ virtual void update(const image::GnashImage& from);
/// Get access to the underlying surface
//
diff --git a/libbase/GnashVaapiTexture.cpp b/libbase/GnashVaapiTexture.cpp
index 90b2184..3692600 100644
--- a/libbase/GnashVaapiTexture.cpp
+++ b/libbase/GnashVaapiTexture.cpp
@@ -24,8 +24,10 @@
namespace gnash {
-GnashVaapiTexture::GnashVaapiTexture(unsigned int width, unsigned int height,
ImageType type)
- : GnashTexture(width, height, type)
+GnashVaapiTexture::GnashVaapiTexture(unsigned int width, unsigned int height,
+ image::ImageType type)
+ :
+ GnashTexture(width, height, type)
{
_flags |= GNASH_TEXTURE_VAAPI;
diff --git a/libbase/GnashVaapiTexture.h b/libbase/GnashVaapiTexture.h
index 152bd3b..ffc06c6 100644
--- a/libbase/GnashVaapiTexture.h
+++ b/libbase/GnashVaapiTexture.h
@@ -33,7 +33,8 @@ class DSOEXPORT GnashVaapiTexture : public GnashTexture {
std::auto_ptr<VaapiSurfaceGLX> _surface;
public:
- GnashVaapiTexture(unsigned int width, unsigned int height, ImageType type);
+ GnashVaapiTexture(unsigned int width, unsigned int height,
+ image::ImageType type);
~GnashVaapiTexture();
/// Copy texture data from a VA surface.
diff --git a/libcore/MovieFactory.cpp b/libcore/MovieFactory.cpp
index 1f2b8c0..54d4517 100644
--- a/libcore/MovieFactory.cpp
+++ b/libcore/MovieFactory.cpp
@@ -153,10 +153,9 @@ createBitmapMovie(std::auto_ptr<IOChannel> in, const
std::string& url,
// to transfer ownership.
boost::shared_ptr<IOChannel> imageData(in.release());
- try
- {
- std::auto_ptr<GnashImage> im(
- ImageInput::readImageData(imageData, type));
+ try {
+ std::auto_ptr<image::GnashImage> im(
+ image::ImageInput::readImageData(imageData, type));
if (!im.get()) {
log_error(_("Can't read image file from %s"), url);
@@ -170,8 +169,7 @@ createBitmapMovie(std::auto_ptr<IOChannel> in, const
std::string& url,
return ret;
}
- catch (ParserException& e)
- {
+ catch (ParserException& e) {
log_error(_("Parsing error: %s"), e.what());
return ret;
}
diff --git a/libcore/Video.cpp b/libcore/Video.cpp
index 5e17d11..795a03e 100644
--- a/libcore/Video.cpp
+++ b/libcore/Video.cpp
@@ -127,7 +127,7 @@ Video::display(Renderer& renderer, const Transform& base)
const Transform xform = base * transform();
const SWFRect& bounds = m_def->bounds();
- GnashImage* img = getVideoFrame();
+ image::GnashImage* img = getVideoFrame();
if (img) {
renderer.drawVideoFrame(img, xform, &bounds, _smoothing);
}
@@ -135,7 +135,7 @@ Video::display(Renderer& renderer, const Transform& base)
clear_invalidated();
}
-GnashImage*
+image::GnashImage*
Video::getVideoFrame()
{
@@ -144,7 +144,7 @@ Video::getVideoFrame()
// frame from there.
if (_ns)
{
- std::auto_ptr<GnashImage> tmp = _ns->get_video();
+ std::auto_ptr<image::GnashImage> tmp = _ns->get_video();
if ( tmp.get() ) _lastDecodedVideoFrame = tmp;
}
diff --git a/libcore/Video.h b/libcore/Video.h
index 0ecd0b5..35e177e 100644
--- a/libcore/Video.h
+++ b/libcore/Video.h
@@ -27,7 +27,9 @@
// Forward declarations
namespace gnash {
class NetStream_as;
- class GnashImage;
+ namespace image {
+ class GnashImage;
+ }
struct ObjectURI;
namespace SWF {
class DefineVideoStreamTag;
@@ -109,7 +111,7 @@ protected:
private:
/// Get video frame to be displayed
- GnashImage* getVideoFrame();
+ image::GnashImage* getVideoFrame();
const boost::intrusive_ptr<const SWF::DefineVideoStreamTag> m_def;
@@ -123,7 +125,7 @@ private:
boost::int32_t _lastDecodedVideoFrameNum;
/// Last decoded frame
- std::auto_ptr<GnashImage> _lastDecodedVideoFrame;
+ std::auto_ptr<image::GnashImage> _lastDecodedVideoFrame;
/// The decoder used to decode the video frames
std::auto_ptr<media::VideoDecoder> _decoder;
diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 1e3599b..39ba327 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -195,7 +195,7 @@ NetStream_as::newFrameReady()
return false;
}
-std::auto_ptr<GnashImage>
+std::auto_ptr<image::GnashImage>
NetStream_as::get_video()
{
boost::mutex::scoped_lock lock(image_mutex);
@@ -556,12 +556,12 @@ NetStream_as::startPlayback()
}
-std::auto_ptr<GnashImage>
+std::auto_ptr<image::GnashImage>
NetStream_as::getDecodedVideoFrame(boost::uint32_t ts)
{
assert(_videoDecoder.get());
- std::auto_ptr<GnashImage> video;
+ std::auto_ptr<image::GnashImage> video;
assert(m_parser.get());
if ( ! m_parser.get() )
@@ -642,10 +642,10 @@ NetStream_as::getDecodedVideoFrame(boost::uint32_t ts)
return video;
}
- std::auto_ptr<GnashImage>
+ std::auto_ptr<image::GnashImage>
NetStream_as::decodeNextVideoFrame()
{
- std::auto_ptr<GnashImage> video;
+ std::auto_ptr<image::GnashImage> video;
if ( ! m_parser.get() )
{
@@ -1169,7 +1169,7 @@ NetStream_as::refreshVideoFrame(bool alsoIfPaused)
#endif
// Get next decoded video frame from parser, will have the lowest timestamp
- std::auto_ptr<GnashImage> video = getDecodedVideoFrame(curPos);
+ std::auto_ptr<image::GnashImage> video = getDecodedVideoFrame(curPos);
// to be decoded or we're out of data
if (!video.get())
diff --git a/libcore/asobj/NetStream_as.h b/libcore/asobj/NetStream_as.h
index f89ed69..d867f76 100644
--- a/libcore/asobj/NetStream_as.h
+++ b/libcore/asobj/NetStream_as.h
@@ -301,7 +301,7 @@ public:
/// @return a image containing the video frame, a NULL auto_ptr if
/// none were ready
///
- std::auto_ptr<GnashImage> get_video();
+ std::auto_ptr<image::GnashImage> get_video();
/// Register the DisplayObject to invalidate on video updates
void setInvalidatedVideo(DisplayObject* ch)
@@ -400,7 +400,7 @@ protected:
boost::mutex image_mutex;
// The image/videoframe which is given to the renderer
- std::auto_ptr<GnashImage> m_imageframe;
+ std::auto_ptr<image::GnashImage> m_imageframe;
// The video URL
std::string url;
@@ -507,7 +507,7 @@ private:
//
/// @return 0 on EOF or error, a decoded video otherwise
///
- std::auto_ptr<GnashImage> decodeNextVideoFrame();
+ std::auto_ptr<image::GnashImage> decodeNextVideoFrame();
/// Decode next audio frame fetching it MediaParser cursor
//
@@ -530,7 +530,7 @@ private:
/// 3. next element in cursor has timestamp > tx
/// 4. there was an error decoding
///
- std::auto_ptr<GnashImage> getDecodedVideoFrame(boost::uint32_t ts);
+ std::auto_ptr<image::GnashImage> getDecodedVideoFrame(boost::uint32_t ts);
DecodingState decodingStatus(DecodingState newstate = DEC_NONE);
diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp
b/libcore/asobj/flash/display/BitmapData_as.cpp
index 6560bf3..51d7800 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -90,7 +90,8 @@ namespace {
}
-BitmapData_as::BitmapData_as(as_object* owner, std::auto_ptr<GnashImage> im)
+BitmapData_as::BitmapData_as(as_object* owner,
+ std::auto_ptr<image::GnashImage> im)
:
_owner(owner),
@@ -209,7 +210,7 @@ BitmapData_as::draw(MovieClip& mc, const Transform&
transform)
{
if (disposed()) return;
- GnashImage& im = *data();
+ image::GnashImage& im = *data();
Renderer* base = getRunResources(*_owner).renderer();
if (!base) {
@@ -802,7 +803,7 @@ bitmapdata_loadBitmap(const fn_call& fn)
if (!bit) return as_value();
- GnashImage& im = bit->image();
+ image::GnashImage& im = bit->image();
const size_t width = im.width();
const size_t height = im.height();
@@ -810,12 +811,12 @@ bitmapdata_loadBitmap(const fn_call& fn)
return as_value();
}
- std::auto_ptr<GnashImage> newImage;
- if (im.type() == GNASH_IMAGE_RGBA) {
- newImage.reset(new ImageRGBA(width, height));
+ std::auto_ptr<image::GnashImage> newImage;
+ if (im.type() == image::GNASH_IMAGE_RGBA) {
+ newImage.reset(new image::ImageRGBA(width, height));
}
else {
- newImage.reset(new ImageRGB(width, height));
+ newImage.reset(new image::ImageRGB(width, height));
}
// The properties come from the 'this' object.
@@ -867,12 +868,12 @@ bitmapdata_ctor(const fn_call& fn)
throw ActionTypeError();
}
- std::auto_ptr<GnashImage> im;
+ std::auto_ptr<image::GnashImage> im;
if (transparent) {
- im.reset(new ImageRGBA(width, height));
+ im.reset(new image::ImageRGBA(width, height));
}
else {
- im.reset(new ImageRGB(width, height));
+ im.reset(new image::ImageRGB(width, height));
}
// There is one special case for completely transparent colours. This
diff --git a/libcore/asobj/flash/display/BitmapData_as.h
b/libcore/asobj/flash/display/BitmapData_as.h
index 9304c7f..fb43d47 100644
--- a/libcore/asobj/flash/display/BitmapData_as.h
+++ b/libcore/asobj/flash/display/BitmapData_as.h
@@ -40,7 +40,9 @@ namespace gnash {
class MovieClip;
class Transform;
class DisplayObject;
- class GnashImage;
+ namespace image {
+ class GnashImage;
+ }
}
namespace gnash {
@@ -59,7 +61,7 @@ public:
//
/// The constructor sets the immutable size of the
/// bitmap, as well as whether it can handle transparency or not.
- BitmapData_as(as_object* owner, std::auto_ptr<GnashImage> im);
+ BitmapData_as(as_object* owner, std::auto_ptr<image::GnashImage> im);
virtual ~BitmapData_as() {}
@@ -82,7 +84,7 @@ public:
bool transparent() const {
assert(data());
- return (data()->type() == GNASH_IMAGE_RGBA);
+ return (data()->type() == image::GNASH_IMAGE_RGBA);
}
const CachedBitmap* bitmapInfo() const {
@@ -143,7 +145,7 @@ public:
private:
- GnashImage* data() const {
+ image::GnashImage* data() const {
return _cachedBitmap.get() ? &_cachedBitmap->image() : _image.get();
}
@@ -155,7 +157,7 @@ private:
boost::intrusive_ptr<CachedBitmap> _cachedBitmap;
- boost::scoped_ptr<GnashImage> _image;
+ boost::scoped_ptr<image::GnashImage> _image;
std::list<DisplayObject*> _attachedObjects;
diff --git a/libcore/parser/BitmapMovieDefinition.cpp
b/libcore/parser/BitmapMovieDefinition.cpp
index 366e530..c6f8f7d 100644
--- a/libcore/parser/BitmapMovieDefinition.cpp
+++ b/libcore/parser/BitmapMovieDefinition.cpp
@@ -38,7 +38,8 @@ BitmapMovieDefinition::createMovie(Global_as& gl,
DisplayObject* parent)
return new BitmapMovie(o, this, parent);
}
-BitmapMovieDefinition::BitmapMovieDefinition(std::auto_ptr<GnashImage> image,
+BitmapMovieDefinition::BitmapMovieDefinition(
+ std::auto_ptr<image::GnashImage> image,
Renderer* renderer, const std::string& url)
:
_version(6),
diff --git a/libcore/parser/BitmapMovieDefinition.h
b/libcore/parser/BitmapMovieDefinition.h
index f53f41e..13d3f94 100644
--- a/libcore/parser/BitmapMovieDefinition.h
+++ b/libcore/parser/BitmapMovieDefinition.h
@@ -19,17 +19,19 @@
#define GNASH_BITMAPMOVIEDEFINITION_H
#include "movie_definition.h" // for inheritance
-#include "SWFRect.h" // for composition
+#include "SWFRect.h"
#include "GnashNumeric.h"
#include <boost/intrusive_ptr.hpp>
#include <string>
-#include <memory> // for auto_ptr
+#include <memory>
// Forward declarations
namespace gnash {
class Renderer;
- class GnashImage;
+ namespace image {
+ class GnashImage;
+ }
}
namespace gnash
@@ -55,8 +57,8 @@ public:
/// - image->size() bytes (for get_bytes_loaded()/get_bytes_total())
/// - provided url
///
- BitmapMovieDefinition(std::auto_ptr<GnashImage> image, Renderer*
renderer,
- const std::string& url);
+ BitmapMovieDefinition(std::auto_ptr<image::GnashImage> image,
+ Renderer* renderer, const std::string& url);
virtual DisplayObject* createDisplayObject(Global_as&, DisplayObject*)
const;
diff --git a/libcore/parser/SWFMovieDefinition.h
b/libcore/parser/SWFMovieDefinition.h
index 8e4d58a..8ea8fc1 100644
--- a/libcore/parser/SWFMovieDefinition.h
+++ b/libcore/parser/SWFMovieDefinition.h
@@ -292,7 +292,7 @@ public:
/// Set an input object for later loading DefineBits
/// images (JPEG images without the table info).
- void set_jpeg_loader(std::auto_ptr<JpegImageInput> j_in) {
+ void set_jpeg_loader(std::auto_ptr<image::JpegImageInput> j_in) {
if (m_jpeg_in.get()) {
/// There should be only one JPEGTABLES tag in an SWF (see:
/// http://www.m2osw.com/en/swf_alexref.html#tag_jpegtables)
@@ -308,7 +308,7 @@ public:
}
// See dox in movie_definition.h
- JpegImageInput* get_jpeg_loader() const {
+ image::JpegImageInput* get_jpeg_loader() const {
return m_jpeg_in.get();
}
@@ -496,7 +496,7 @@ private:
boost::uint32_t m_file_length;
- std::auto_ptr<JpegImageInput> m_jpeg_in;
+ std::auto_ptr<image::JpegImageInput> m_jpeg_in;
std::string _url;
diff --git a/libcore/parser/movie_definition.h
b/libcore/parser/movie_definition.h
index 1e0474b..12da696 100644
--- a/libcore/parser/movie_definition.h
+++ b/libcore/parser/movie_definition.h
@@ -72,7 +72,9 @@ namespace gnash {
}
class Font;
class sound_sample;
- class JpegImageInput;
+ namespace image {
+ class JpegImageInput;
+ }
}
namespace gnash
@@ -307,7 +309,7 @@ public:
/// *is* performed, and it is deleting the jpeg::input instance since
/// it is passed in an auto_ptr...
///
- virtual void set_jpeg_loader(std::auto_ptr<JpegImageInput> /*j_in*/)
+ virtual void set_jpeg_loader(std::auto_ptr<image::JpegImageInput>
/*j_in*/)
{
}
@@ -322,7 +324,7 @@ public:
///
/// NOTE: ownership of the returned object is NOT transferred
///
- virtual JpegImageInput* get_jpeg_loader() const
+ virtual image::JpegImageInput* get_jpeg_loader() const
{
return NULL;
}
diff --git a/libcore/swf/tag_loaders.cpp b/libcore/swf/tag_loaders.cpp
index 0b3274b..4c77440 100644
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -239,7 +239,7 @@ jpeg_tables_loader(SWFStream& in, TagType tag,
movie_definition& m,
currPos);
}
- std::auto_ptr<JpegImageInput> input;
+ std::auto_ptr<image::JpegImageInput> input;
try
{
@@ -252,8 +252,8 @@ jpeg_tables_loader(SWFStream& in, TagType tag,
movie_definition& m,
//
boost::shared_ptr<IOChannel> ad(StreamAdapter::getFile(in,
std::numeric_limits<std::streamsize>::max()).release());
- // transfer ownership to the JpegImageInput
- input = JpegImageInput::createSWFJpeg2HeaderOnly(ad, jpegHeaderSize);
+ // transfer ownership to the image::JpegImageInput
+ input = image::JpegImageInput::createSWFJpeg2HeaderOnly(ad,
jpegHeaderSize);
}
catch (std::exception& e)
@@ -271,7 +271,7 @@ jpeg_tables_loader(SWFStream& in, TagType tag,
movie_definition& m,
// A JPEG image without included tables; those should be in an
-// existing JpegImageInput object stored in the movie.
+// existing image::JpegImageInput object stored in the movie.
void
define_bits_jpeg_loader(SWFStream& in, TagType tag, movie_definition& m,
const RunResources& r)
@@ -291,7 +291,7 @@ define_bits_jpeg_loader(SWFStream& in, TagType tag,
movie_definition& m,
}
// Read the image data.
- JpegImageInput* j_in = m.get_jpeg_loader();
+ image::JpegImageInput* j_in = m.get_jpeg_loader();
if ( ! j_in )
{
IF_VERBOSE_MALFORMED_SWF(
@@ -303,13 +303,11 @@ define_bits_jpeg_loader(SWFStream& in, TagType tag,
movie_definition& m,
j_in->discardPartialBuffer();
- std::auto_ptr<GnashImage> im;
- try
- {
- im = JpegImageInput::readSWFJpeg2WithTables(*j_in);
+ std::auto_ptr<image::GnashImage> im;
+ try {
+ im = image::JpegImageInput::readSWFJpeg2WithTables(*j_in);
}
- catch (std::exception& e)
- {
+ catch (std::exception& e) {
IF_VERBOSE_MALFORMED_SWF(
log_swferror("Error reading jpeg2 with headers for DisplayObject "
"id %d: %s", id, e.what());
@@ -377,7 +375,7 @@ define_bits_jpeg2_loader(SWFStream& in, TagType tag,
movie_definition& m,
boost::shared_ptr<IOChannel> ad(StreamAdapter::getFile(in,
in.get_tag_end_position()).release() );
- std::auto_ptr<GnashImage> im (ImageInput::readImageData(ad, ft));
+ std::auto_ptr<image::GnashImage> im (image::ImageInput::readImageData(ad,
ft));
Renderer* renderer = r.renderer();
if (!renderer) {
@@ -510,9 +508,9 @@ define_bits_jpeg3_loader(SWFStream& in, TagType tag,
movie_definition& m,
//
// Read rgb data.
- boost::shared_ptr<IOChannel> ad( StreamAdapter::getFile(in,
- alpha_position).release() );
- std::auto_ptr<ImageRGBA> im = ImageInput::readSWFJpeg3(ad);
+ boost::shared_ptr<IOChannel> ad(StreamAdapter::getFile(in,
+ alpha_position).release());
+ std::auto_ptr<image::ImageRGBA> im = image::ImageInput::readSWFJpeg3(ad);
/// Failure to read the jpeg.
if (!im.get()) return;
@@ -531,8 +529,7 @@ define_bits_jpeg3_loader(SWFStream& in, TagType tag,
movie_definition& m,
// TESTING:
// magical trevor contains this tag
// ea8bbad50ccbc52dd734dfc93a7f06a7 6964trev3c.swf
- im->mergeAlpha(buffer.get(), bufferLength);
-
+ image::mergeAlpha(*im, buffer.get(), bufferLength);
Renderer* renderer = r.renderer();
if (!renderer) {
@@ -540,7 +537,7 @@ define_bits_jpeg3_loader(SWFStream& in, TagType tag,
movie_definition& m,
return;
}
boost::intrusive_ptr<CachedBitmap> bi =
- renderer->createCachedBitmap(static_cast<std::auto_ptr<GnashImage>
>(im));
+
renderer->createCachedBitmap(static_cast<std::auto_ptr<image::GnashImage>
>(im));
// add bitmap to movie under DisplayObject id.
m.addBitmap(id, bi);
@@ -595,17 +592,17 @@ define_bits_lossless_2_loader(SWFStream& in, TagType tag,
movie_definition& m,
#else
unsigned short channels;
- std::auto_ptr<GnashImage> image;
+ std::auto_ptr<image::GnashImage> image;
bool alpha = false;
switch (tag)
{
case SWF::DEFINELOSSLESS:
- image.reset(new ImageRGB(width, height));
+ image.reset(new image::ImageRGB(width, height));
channels = 3;
break;
case SWF::DEFINELOSSLESS2:
- image.reset(new ImageRGBA(width, height));
+ image.reset(new image::ImageRGBA(width, height));
channels = 4;
alpha = true;
break;
diff --git a/libmedia/VideoDecoder.h b/libmedia/VideoDecoder.h
index 6f53a76..68ee6df 100644
--- a/libmedia/VideoDecoder.h
+++ b/libmedia/VideoDecoder.h
@@ -59,7 +59,7 @@ public:
//
/// @return The decoded video frame, or a NULL-containing auto_ptr if an
/// error occurred.
- virtual std::auto_ptr<GnashImage> pop() = 0;
+ virtual std::auto_ptr<image::GnashImage> pop() = 0;
/// \brief
/// Check whether a decoded frame is ready to be popped.
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
index 5c94cbe..947dbf9 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
@@ -236,7 +236,7 @@ VideoDecoderFfmpeg::height() const
return _videoCodecCtx->getContext()->height;
}
-std::auto_ptr<GnashImage>
+std::auto_ptr<image::GnashImage>
VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
const AVFrame& srcFrameRef)
{
@@ -253,7 +253,7 @@ VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
PixelFormat pixFmt = PIX_FMT_RGB24;
#endif
- std::auto_ptr<GnashImage> im;
+ std::auto_ptr<image::GnashImage> im;
#ifdef HAVE_VA_VA_H
VaapiContextFfmpeg * const vactx = get_vaapi_context(srcCtx);
@@ -263,7 +263,7 @@ VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
im.reset();
return im;
}
- im.reset(new GnashVaapiImage(vaSurface->get(), GNASH_IMAGE_RGBA));
+ im.reset(new GnashVaapiImage(vaSurface->get(),
image::GNASH_IMAGE_RGBA));
return im;
}
#endif
@@ -300,11 +300,11 @@ VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
// As of libavcodec 0.svn20080206-17 it is a define
#ifdef PIX_FMT_RGBA
case PIX_FMT_RGBA:
- im.reset(new ImageRGBA(width, height));
+ im.reset(new image::ImageRGBA(width, height));
break;
#endif
case PIX_FMT_RGB24:
- im.reset(new ImageRGB(width, height));
+ im.reset(new image::ImageRGB(width, height));
break;
default:
log_error("Pixel format not handled");
@@ -343,7 +343,7 @@ VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
}
-std::auto_ptr<GnashImage>
+std::auto_ptr<image::GnashImage>
VideoDecoderFfmpeg::decode(const boost::uint8_t* input,
boost::uint32_t input_size)
{
@@ -351,7 +351,7 @@ VideoDecoderFfmpeg::decode(const boost::uint8_t* input,
// do anything anyway.
assert(_videoCodecCtx.get());
- std::auto_ptr<GnashImage> ret;
+ std::auto_ptr<image::GnashImage> ret;
AVFrame* frame = avcodec_alloc_frame();
if ( ! frame ) {
@@ -384,10 +384,10 @@ VideoDecoderFfmpeg::push(const EncodedVideoFrame& buffer)
_video_frames.push_back(&buffer);
}
-std::auto_ptr<GnashImage>
+std::auto_ptr<image::GnashImage>
VideoDecoderFfmpeg::pop()
{
- std::auto_ptr<GnashImage> ret;
+ std::auto_ptr<image::GnashImage> ret;
for (std::vector<const EncodedVideoFrame*>::iterator it =
_video_frames.begin(), end = _video_frames.end(); it != end;
++it) {
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.h
b/libmedia/ffmpeg/VideoDecoderFfmpeg.h
index e505759..1a4eaf0 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.h
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.h
@@ -55,7 +55,7 @@ public:
void push(const EncodedVideoFrame& buffer);
- std::auto_ptr<GnashImage> pop();
+ std::auto_ptr<image::GnashImage> pop();
bool peek();
@@ -80,16 +80,16 @@ private:
/// caller owns that pointer, which must be freed with delete [].
/// It is advised to wrap the pointer in a boost::scoped_array.
/// If conversion fails, AVPicture::data[0] will be NULL.
- std::auto_ptr<GnashImage> frameToImage(AVCodecContext* srcCtx,
+ std::auto_ptr<image::GnashImage> frameToImage(AVCodecContext* srcCtx,
const AVFrame& srcFrame);
void init(enum CodecID format, int width, int height,
boost::uint8_t* extradata=0, int extradataSize=0);
- std::auto_ptr<GnashImage> decode(const boost::uint8_t* input,
+ std::auto_ptr<image::GnashImage> decode(const boost::uint8_t* input,
boost::uint32_t input_size);
- std::auto_ptr<GnashImage> decode(const EncodedVideoFrame* vf)
+ std::auto_ptr<image::GnashImage> decode(const EncodedVideoFrame* vf)
{
return decode(vf->data(), vf->dataSize());
}
diff --git a/libmedia/gst/VideoDecoderGst.cpp b/libmedia/gst/VideoDecoderGst.cpp
index 626187a..bc712b4 100644
--- a/libmedia/gst/VideoDecoderGst.cpp
+++ b/libmedia/gst/VideoDecoderGst.cpp
@@ -182,13 +182,13 @@ VideoDecoderGst::push(const EncodedVideoFrame& frame)
}
-std::auto_ptr<GnashImage>
+std::auto_ptr<image::GnashImage>
VideoDecoderGst::pop()
{
GstBuffer * buffer = swfdec_gst_decoder_pull (&_decoder);
if (!buffer) {
- return std::auto_ptr<GnashImage>();
+ return std::auto_ptr<image::GnashImage>();
}
GstCaps* caps = gst_buffer_get_caps(buffer);
@@ -202,7 +202,7 @@ VideoDecoderGst::pop()
gst_caps_unref(caps);
- std::auto_ptr<GnashImage> ret(new gnashGstBuffer(buffer, _width, _height));
+ std::auto_ptr<image::GnashImage> ret(new gnashGstBuffer(buffer, _width,
_height));
return ret;
}
diff --git a/libmedia/gst/VideoDecoderGst.h b/libmedia/gst/VideoDecoderGst.h
index 1ba126b..5093b16 100644
--- a/libmedia/gst/VideoDecoderGst.h
+++ b/libmedia/gst/VideoDecoderGst.h
@@ -36,11 +36,11 @@ namespace media {
namespace gst {
// Convenience wrapper for GstBuffer. Intended to be wrapped in an auto_ptr.
-class gnashGstBuffer : public ImageRGB
+class gnashGstBuffer : public image::ImageRGB
{
public:
gnashGstBuffer(GstBuffer* buf, int width, int height)
- : ImageRGB(NULL, width, height),
+ : image::ImageRGB(NULL, width, height),
_buffer(buf)
{}
@@ -79,7 +79,7 @@ public:
void push(const EncodedVideoFrame& buffer);
- std::auto_ptr<GnashImage> pop();
+ std::auto_ptr<image::GnashImage> pop();
bool peek();
diff --git a/librender/Renderer.h b/librender/Renderer.h
index 9bea1b5..02912a7 100644
--- a/librender/Renderer.h
+++ b/librender/Renderer.h
@@ -166,6 +166,8 @@ namespace gnash {
class SWFMatrix;
class FillStyle;
class LineStyle;
+ class Shape;
+ class MorphShape;
// XXX: GnashImageProxy (delayed image rendering)
class GnashVaapiImageProxy;
@@ -173,11 +175,9 @@ namespace gnash {
namespace SWF {
class ShapeRecord;
}
-
- class Shape;
- class MorphShape;
-
- class GnashImage;
+ namespace image {
+ class GnashImage;
+ }
}
namespace gnash {
@@ -224,7 +224,8 @@ public:
/// Given an image, returns a pointer to a bitmap_info class
/// that can later be passed to FillStyleX_bitmap(), to set a
/// bitmap fill style.
- virtual CachedBitmap* createCachedBitmap(std::auto_ptr<GnashImage> im) = 0;
+ virtual CachedBitmap* createCachedBitmap(
+ std::auto_ptr<image::GnashImage> im) = 0;
/// ==================================================================
@@ -252,8 +253,8 @@ public:
/// The width and height determine the size of the Flash video instance
/// on the stage (in TWIPS) prior to SWFMatrix transformations.
///
- virtual void drawVideoFrame(GnashImage* frame, const Transform& xform,
- const SWFRect* bounds, bool smooth) = 0;
+ virtual void drawVideoFrame(image::GnashImage* frame,
+ const Transform& xform, const SWFRect* bounds, bool smooth) = 0;
/// Draw a line-strip directly, using a thin, solid line.
//
@@ -598,7 +599,7 @@ public:
public:
/// Prepare the renderer for internal rendering
- Internal(Renderer& r, GnashImage& im)
+ Internal(Renderer& r, image::GnashImage& im)
:
_r(r),
_ext(_r.startInternalRender(im))
@@ -648,7 +649,7 @@ private:
/// Implementations are free to return a new renderer if they choose.
//
/// @return 0 if the renderer does not support this.
- virtual Renderer* startInternalRender(GnashImage& buffer) = 0;
+ virtual Renderer* startInternalRender(image::GnashImage& buffer) = 0;
/// Finish internal rendering.
//
diff --git a/librender/Renderer_agg.cpp b/librender/Renderer_agg.cpp
index 8ec5120..cfec14c 100644
--- a/librender/Renderer_agg.cpp
+++ b/librender/Renderer_agg.cpp
@@ -581,7 +581,7 @@ public:
typedef agg::trans_affine Matrix;
- VideoRenderer(const ClipBounds& clipbounds, GnashImage& frame,
+ VideoRenderer(const ClipBounds& clipbounds, image::GnashImage& frame,
Matrix& mat, Quality quality, bool smooth)
:
_buf(frame.begin(), frame.width(), frame.height(),
@@ -696,7 +696,7 @@ public:
// Given an image, returns a pointer to a bitmap_info class
// that can later be passed to FillStyleX_bitmap(), to set a
// bitmap fill style.
- gnash::CachedBitmap* createCachedBitmap(std::auto_ptr<GnashImage> im)
+ gnash::CachedBitmap* createCachedBitmap(std::auto_ptr<image::GnashImage>
im)
{
return new agg_bitmap_info(im);
}
@@ -705,7 +705,7 @@ public:
FileType type) const
{
log_debug("New image: %sx%s", xres, yres);
- ImageRGBA im(xres, yres);
+ image::ImageRGBA im(xres, yres);
for (int x = 0; x < xres; ++x) {
for (int y = 0; y < yres; ++y) {
typename PixelFormat::color_type t = m_pixf->pixel(x, y);
@@ -713,11 +713,11 @@ public:
}
}
- ImageOutput::writeImageData(type, io, im, 100);
+ image::ImageOutput::writeImageData(type, io, im, 100);
}
template<typename SourceFormat, typename Matrix>
- void renderVideo(GnashImage& frame, Matrix& img_mtx,
+ void renderVideo(image::GnashImage& frame, Matrix& img_mtx,
agg::path_storage path, bool smooth)
{
@@ -741,7 +741,7 @@ public:
vr.render(path, rbase, _alphaMasks);
}
- void drawVideoFrame(GnashImage* frame, const Transform& xform,
+ void drawVideoFrame(image::GnashImage* frame, const Transform& xform,
const SWFRect* bounds, bool smooth)
{
@@ -784,7 +784,7 @@ public:
path.line_to(a.x, a.y);
#ifdef HAVE_VA_VA_H
- if (frame->location() == GNASH_IMAGE_GPU) {
+ if (frame->location() == image::GNASH_IMAGE_GPU) {
RenderImage image;
image.reset(new GnashVaapiImageProxy(
static_cast<GnashVaapiImage *>(frame),
@@ -799,10 +799,10 @@ public:
switch (frame->type())
{
- case GNASH_IMAGE_RGBA:
+ case image::GNASH_IMAGE_RGBA:
renderVideo<agg::pixfmt_rgba32_pre>(*frame, mtx, path, smooth);
break;
- case GNASH_IMAGE_RGB:
+ case image::GNASH_IMAGE_RGB:
renderVideo<agg::pixfmt_rgb24_pre>(*frame, mtx, path, smooth);
break;
default:
@@ -884,22 +884,22 @@ public:
}
- virtual Renderer* startInternalRender(GnashImage& im) {
+ virtual Renderer* startInternalRender(image::GnashImage& im) {
std::auto_ptr<Renderer_agg_base> in;
switch (im.type()) {
- case GNASH_IMAGE_RGB:
+ case image::GNASH_IMAGE_RGB:
in.reset(new Renderer_agg<typename RGB::PixelFormat>(24));
break;
- case GNASH_IMAGE_RGBA:
+ case image::GNASH_IMAGE_RGBA:
in.reset(new Renderer_agg<typename RGBA::PixelFormat>(32));
break;
}
const size_t width = im.width();
const size_t height = im.height();
- const size_t stride = width * (im.type() == GNASH_IMAGE_RGBA ? 4 : 3);
+ const size_t stride = width * (im.type() == image::GNASH_IMAGE_RGBA ?
4 : 3);
in->init_buffer(im.begin(), width * height, width, height, stride);
_external.reset(in.release());
diff --git a/librender/Renderer_agg_bitmap.h b/librender/Renderer_agg_bitmap.h
index f2e8685..291b8ca 100644
--- a/librender/Renderer_agg_bitmap.h
+++ b/librender/Renderer_agg_bitmap.h
@@ -29,14 +29,14 @@ class agg_bitmap_info : public CachedBitmap
{
public:
- agg_bitmap_info(std::auto_ptr<GnashImage> im)
+ agg_bitmap_info(std::auto_ptr<image::GnashImage> im)
:
_image(im.release()),
- _bpp(_image->type() == GNASH_IMAGE_RGB ? 24 : 32)
+ _bpp(_image->type() == image::GNASH_IMAGE_RGB ? 24 : 32)
{
}
- virtual GnashImage& image() {
+ virtual image::GnashImage& image() {
assert(!disposed());
return *_image;
}
@@ -57,7 +57,7 @@ public:
private:
- boost::scoped_ptr<GnashImage> _image;
+ boost::scoped_ptr<image::GnashImage> _image;
int _bpp;
diff --git a/librender/Renderer_cairo.cpp b/librender/Renderer_cairo.cpp
index afeec19..f32540d 100644
--- a/librender/Renderer_cairo.cpp
+++ b/librender/Renderer_cairo.cpp
@@ -65,7 +65,7 @@ namespace {
// Converts from RGB image to 32-bit pixels in CAIRO_FORMAT_RGB24 format
static void
-rgb_to_cairo_rgb24(boost::uint8_t* dst, const GnashImage* im)
+rgb_to_cairo_rgb24(boost::uint8_t* dst, const image::GnashImage* im)
{
boost::uint32_t* dst32 = reinterpret_cast<boost::uint32_t*>(dst);
for (size_t y = 0; y < im->height(); y++)
@@ -79,7 +79,7 @@ rgb_to_cairo_rgb24(boost::uint8_t* dst, const GnashImage* im)
// Converts from RGBA image to 32-bit pixels in CAIRO_FORMAT_ARGB32 format
static void
-rgba_to_cairo_argb(boost::uint8_t* dst, const GnashImage* im)
+rgba_to_cairo_argb(boost::uint8_t* dst, const image::GnashImage* im)
{
boost::uint32_t* dst32 = reinterpret_cast<boost::uint32_t*>(dst);
for (size_t y = 0; y < im->height(); y++)
@@ -131,16 +131,16 @@ class bitmap_info_cairo : public CachedBitmap,
boost::noncopyable
}
- GnashImage& image() {
+ image::GnashImage& image() {
if (_image.get()) return *_image;
switch (_format) {
case CAIRO_FORMAT_RGB24:
- _image.reset(new ImageRGB(_width, _height));
+ _image.reset(new image::ImageRGB(_width, _height));
break;
case CAIRO_FORMAT_ARGB32:
- _image.reset(new ImageRGBA(_width, _height));
+ _image.reset(new image::ImageRGBA(_width, _height));
break;
default:
@@ -205,7 +205,7 @@ class bitmap_info_cairo : public CachedBitmap,
boost::noncopyable
}
private:
- mutable boost::scoped_ptr<GnashImage> _image;
+ mutable boost::scoped_ptr<image::GnashImage> _image;
boost::scoped_array<boost::uint8_t> _data;
int _width;
int _height;
@@ -455,14 +455,14 @@ Renderer_cairo::~Renderer_cairo()
}
CachedBitmap*
-Renderer_cairo::createCachedBitmap(std::auto_ptr<GnashImage> im)
+Renderer_cairo::createCachedBitmap(std::auto_ptr<image::GnashImage> im)
{
int buf_size = im->width() * im->height() * 4;
boost::uint8_t* buffer = new boost::uint8_t[buf_size];
switch (im->type())
{
- case GNASH_IMAGE_RGB:
+ case image::GNASH_IMAGE_RGB:
{
rgb_to_cairo_rgb24(buffer, im.get());
@@ -470,7 +470,7 @@
Renderer_cairo::createCachedBitmap(std::auto_ptr<GnashImage> im)
CAIRO_FORMAT_RGB24);
}
- case GNASH_IMAGE_RGBA:
+ case image::GNASH_IMAGE_RGBA:
{
rgba_to_cairo_argb(buffer, im.get());
@@ -484,17 +484,17 @@
Renderer_cairo::createCachedBitmap(std::auto_ptr<GnashImage> im)
}
void
-Renderer_cairo::drawVideoFrame(GnashImage* baseframe, const Transform& xform,
+Renderer_cairo::drawVideoFrame(image::GnashImage* baseframe, const Transform&
xform,
const SWFRect* bounds, bool /*smooth*/)
{
- if (baseframe->type() == GNASH_IMAGE_RGBA)
+ if (baseframe->type() == image::GNASH_IMAGE_RGBA)
{
LOG_ONCE(log_error(_("Can't render videos with alpha")));
return;
}
- ImageRGB* frame = dynamic_cast<ImageRGB*>(baseframe);
+ image::ImageRGB* frame = dynamic_cast<image::ImageRGB*>(baseframe);
assert(frame);
diff --git a/librender/Renderer_cairo.h b/librender/Renderer_cairo.h
index d2ce0f7..0a1a2eb 100644
--- a/librender/Renderer_cairo.h
+++ b/librender/Renderer_cairo.h
@@ -45,9 +45,9 @@ public:
std::string description() const { return "Cairo"; }
- CachedBitmap* createCachedBitmap(std::auto_ptr<GnashImage> im);
+ CachedBitmap* createCachedBitmap(std::auto_ptr<image::GnashImage> im);
- void drawVideoFrame(GnashImage* baseframe, const Transform& xform,
+ void drawVideoFrame(image::GnashImage* baseframe, const Transform& xform,
const SWFRect* bounds, bool smooth);
geometry::Range2d<int> world_to_pixel(const SWFRect& worldbounds);
@@ -57,7 +57,7 @@ public:
void set_invalidated_regions(const InvalidatedRanges& ranges);
- virtual Renderer* startInternalRender(GnashImage& /*im*/) {
+ virtual Renderer* startInternalRender(image::GnashImage& /*im*/) {
return 0;
}
diff --git a/librender/Renderer_ogl.cpp b/librender/Renderer_ogl.cpp
index 617273e..6c88c0d 100644
--- a/librender/Renderer_ogl.cpp
+++ b/librender/Renderer_ogl.cpp
@@ -129,7 +129,7 @@ public:
WRAP_CLAMP
};
- bitmap_info_ogl(std::auto_ptr<GnashImage> image, GLenum pixelformat,
+ bitmap_info_ogl(std::auto_ptr<image::GnashImage> image, GLenum pixelformat,
bool ogl_accessible);
~bitmap_info_ogl();
@@ -143,14 +143,14 @@ public:
return _disposed;
}
- virtual GnashImage& image() {
+ virtual image::GnashImage& image() {
if (_cache.get()) return *_cache;
switch (_pixel_format) {
case GL_RGB:
- _cache.reset(new ImageRGB(_orig_width, _orig_height));
+ _cache.reset(new image::ImageRGB(_orig_width, _orig_height));
break;
case GL_RGBA:
- _cache.reset(new ImageRGBA(_orig_width, _orig_height));
+ _cache.reset(new image::ImageRGBA(_orig_width, _orig_height));
break;
default:
std::abort();
@@ -166,8 +166,8 @@ private:
void setup() const;
void upload(boost::uint8_t* data, size_t width, size_t height) const;
- mutable boost::scoped_ptr<GnashImage> _img;
- mutable boost::scoped_ptr<GnashImage> _cache;
+ mutable boost::scoped_ptr<image::GnashImage> _img;
+ mutable boost::scoped_ptr<image::GnashImage> _cache;
GLenum _pixel_format;
GLenum _ogl_img_type;
mutable bool _ogl_accessible;
@@ -549,7 +549,7 @@ bool isEven(const size_t& n)
}
-bitmap_info_ogl::bitmap_info_ogl(std::auto_ptr<GnashImage> image,
+bitmap_info_ogl::bitmap_info_ogl(std::auto_ptr<image::GnashImage> image,
GLenum pixelformat, bool ogl_accessible)
:
_img(image.release()),
@@ -784,40 +784,40 @@ public:
#endif
}
- virtual CachedBitmap* createCachedBitmap(std::auto_ptr<GnashImage> im)
+ virtual CachedBitmap* createCachedBitmap(std::auto_ptr<image::GnashImage> im)
{
switch (im->type()) {
- case GNASH_IMAGE_RGB:
+ case image::GNASH_IMAGE_RGB:
{
- std::auto_ptr<GnashImage> rgba(
- new ImageRGBA(im->width(), im->height()));
+ std::auto_ptr<image::GnashImage> rgba(
+ new image::ImageRGBA(im->width(), im->height()));
- GnashImage::iterator it = rgba->begin();
+ image::GnashImage::iterator it = rgba->begin();
for (size_t i = 0; i < im->size(); ++i) {
*it++ = *(im->begin() + i);
if (!(i % 3)) *it++ = 0xff;
}
im = rgba;
}
- case GNASH_IMAGE_RGBA:
+ case image::GNASH_IMAGE_RGBA:
return new bitmap_info_ogl(im, GL_RGBA, ogl_accessible());
default:
std::abort();
}
}
- boost::shared_ptr<GnashTexture> getCachedTexture(GnashImage *frame)
+ boost::shared_ptr<GnashTexture> getCachedTexture(image::GnashImage *frame)
{
boost::shared_ptr<GnashTexture> texture;
GnashTextureFormat frameFormat(frame->type());
unsigned int frameFlags;
switch (frame->location()) {
- case GNASH_IMAGE_CPU:
+ case image::GNASH_IMAGE_CPU:
frameFlags = 0;
break;
#ifdef HAVE_VA_VA_GLX_H
- case GNASH_IMAGE_GPU:
+ case image::GNASH_IMAGE_GPU:
frameFlags = GNASH_TEXTURE_VAAPI;
break;
#endif
@@ -850,12 +850,12 @@ public:
_cached_textures.clear();
switch (frame->location()) {
- case GNASH_IMAGE_CPU:
+ case image::GNASH_IMAGE_CPU:
texture.reset(new GnashTexture(frame->width(),
frame->height(),
frame->type()));
break;
- case GNASH_IMAGE_GPU:
+ case image::GNASH_IMAGE_GPU:
// This case should never be reached if vaapi is not
// enabled; but has to be handled to keep the compiler
// happy.
@@ -881,7 +881,7 @@ public:
// anti-aliased with the rest of the drawing. Since display lists cannot be
// concatenated this means we'll add up with several display lists for normal
// drawing operations.
- virtual void drawVideoFrame(GnashImage* frame, const Transform& xform,
+ virtual void drawVideoFrame(image::GnashImage* frame, const Transform& xform,
const SWFRect* bounds, bool /*smooth*/)
{
GLint index;
@@ -901,11 +901,11 @@ public:
return;
switch (frame->location()) {
- case GNASH_IMAGE_CPU:
+ case image::GNASH_IMAGE_CPU:
texture->update(frame->begin());
break;
#ifdef HAVE_VA_VA_GLX_H
- case GNASH_IMAGE_GPU:
+ case image::GNASH_IMAGE_GPU:
dynamic_cast<GnashVaapiTexture
*>(texture.get())->update(dynamic_cast<GnashVaapiImage *>(frame)->surface());
break;
#endif
@@ -981,7 +981,7 @@ private:
public:
- virtual Renderer* startInternalRender(GnashImage& /*im*/) {
+ virtual Renderer* startInternalRender(image::GnashImage& /*im*/) {
return 0;
}
@@ -1974,13 +1974,13 @@ sampleGradient(const GradientFill& fill, boost::uint8_t
ratio)
const CachedBitmap*
createGradientBitmap(const GradientFill& gf, Renderer& renderer)
{
- std::auto_ptr<ImageRGBA> im;
+ std::auto_ptr<image::ImageRGBA> im;
switch (gf.type())
{
case GradientFill::LINEAR:
// Linear gradient.
- im.reset(new ImageRGBA(256, 1));
+ im.reset(new image::ImageRGBA(256, 1));
for (size_t i = 0; i < im->width(); i++) {
@@ -1992,7 +1992,7 @@ createGradientBitmap(const GradientFill& gf, Renderer&
renderer)
case GradientFill::RADIAL:
// Focal gradient.
- im.reset(new ImageRGBA(64, 64));
+ im.reset(new image::ImageRGBA(64, 64));
for (size_t j = 0; j < im->height(); j++)
{
@@ -2017,7 +2017,7 @@ createGradientBitmap(const GradientFill& gf, Renderer&
renderer)
}
const CachedBitmap* bi = renderer.createCachedBitmap(
- static_cast<std::auto_ptr<GnashImage> >(im));
+ static_cast<std::auto_ptr<image::GnashImage> >(im));
return bi;
}
-----------------------------------------------------------------------
Summary of changes:
libbase/CachedBitmap.h | 6 ++-
libbase/GnashImage.cpp | 53 ++++++++++----------
libbase/GnashImage.h | 42 +++++++++-------
libbase/GnashImageGif.cpp | 18 ++++---
libbase/GnashImageGif.h | 18 ++++---
libbase/GnashImageJpeg.cpp | 53 ++++++++++----------
libbase/GnashImageJpeg.h | 44 ++++++++--------
libbase/GnashImagePng.cpp | 66 +++++++++++++------------
libbase/GnashImagePng.h | 30 ++++++-----
libbase/GnashTexture.cpp | 34 ++++++++-----
libbase/GnashTexture.h | 5 +-
libbase/GnashVaapiImage.cpp | 36 +++++++------
libbase/GnashVaapiImage.h | 7 ++-
libbase/GnashVaapiTexture.cpp | 6 ++-
libbase/GnashVaapiTexture.h | 3 +-
libbase/ImageIterators.h | 14 +++---
libcore/BitmapMovie.h | 4 +-
libcore/MovieClip.h | 1 -
libcore/MovieFactory.cpp | 10 ++--
libcore/Video.cpp | 6 +-
libcore/Video.h | 8 ++-
libcore/asobj/NetStream_as.cpp | 12 ++--
libcore/asobj/NetStream_as.h | 8 ++--
libcore/asobj/flash/display/BitmapData_as.cpp | 21 ++++----
libcore/asobj/flash/display/BitmapData_as.h | 12 +++--
libcore/parser/BitmapMovieDefinition.cpp | 3 +-
libcore/parser/BitmapMovieDefinition.h | 12 +++--
libcore/parser/SWFMovieDefinition.h | 6 +-
libcore/parser/movie_definition.h | 8 ++-
libcore/swf/tag_loaders.cpp | 39 +++++++--------
libmedia/VideoDecoder.h | 2 +-
libmedia/ffmpeg/VideoDecoderFfmpeg.cpp | 18 +++---
libmedia/ffmpeg/VideoDecoderFfmpeg.h | 8 ++--
libmedia/gst/VideoDecoderGst.cpp | 6 +-
libmedia/gst/VideoDecoderGst.h | 6 +-
librender/Renderer.h | 21 ++++----
librender/Renderer_agg.cpp | 26 +++++-----
librender/Renderer_agg_bitmap.h | 8 ++--
librender/Renderer_cairo.cpp | 24 +++++-----
librender/Renderer_cairo.h | 6 +-
librender/Renderer_ogl.cpp | 52 ++++++++++----------
41 files changed, 399 insertions(+), 363 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 829b1fbdb6a53e02a8594c0183682f6768a74126,
Benjamin Wolsey <=