wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 399925 - "GIF decoder needs to allow its data to be discarded" [p=alfredkayser@gmail.com (Alfred Kayser) r=stuart sr=tor a=blocking1.9+]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-03-09 22:09:24 -07:00
parent ba1b4dde66
commit fd30224781
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/libpr0n/decoders/gif/nsGIFDecoder2.cpp
View File

@ -142,8 +142,18 @@ NS_IMETHODIMP nsGIFDecoder2::Init(imgILoad *aLoad)
{
mObserver = do_QueryInterface(aLoad);
/* The image container may already exist if it is reloading itself from us.
*/
aLoad->GetImage(getter_AddRefs(mImageContainer));
if (!mImageContainer) {
mImageContainer = do_CreateInstance("@mozilla.org/image/container;1");
if (!mImageContainer)
return NS_ERROR_OUT_OF_MEMORY;
aLoad->SetImage(mImageContainer);
nsresult rv = mImageContainer->SetDiscardable("image/gif");
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
}
// Start with the version (GIF89a|GIF87a)
mGIFStruct.state = gif_type;
@ -174,7 +184,7 @@ NS_IMETHODIMP nsGIFDecoder2::Close()
/* void flush (); */
NS_IMETHODIMP nsGIFDecoder2::Flush()
{
return NS_ERROR_NOT_IMPLEMENTED;
return NS_OK;
}
//******************************************************************************
@ -187,7 +197,7 @@ static NS_METHOD ReadDataOut(nsIInputStream* in,
PRUint32 *writeCount)
{
nsGIFDecoder2 *decoder = static_cast<nsGIFDecoder2*>(closure);
nsresult rv = decoder->ProcessData((unsigned char*)fromRawSegment, count, writeCount);
nsresult rv = decoder->ProcessData(fromRawSegment, count, writeCount);
if (NS_FAILED(rv)) {
*writeCount = 0;
return rv;
@ -236,11 +246,11 @@ nsGIFDecoder2::FlushImageData()
}
//******************************************************************************
nsresult nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count, PRUint32 *_retval)
nsresult nsGIFDecoder2::ProcessData(const char *data, PRUint32 count, PRUint32 *_retval)
{
// Push the data to the GIF decoder
nsresult rv = GifWrite(data, count);
nsresult rv = GifWrite((const PRUint8*)data, count);
NS_ENSURE_SUCCESS(rv, rv);
// Flushing is only needed for first frame
@ -250,6 +260,13 @@ nsresult nsGIFDecoder2::ProcessData(unsigned char *data, PRUint32 count, PRUint3
mLastFlushedPass = mCurrentPass;
}
// We should just disable the 'restore' when AddRestoreData fails, so that we still load the image...
rv = mImageContainer->AddRestoreData(data, count);
if (NS_FAILED(rv)) {
mGIFStruct.state = gif_oom;
return rv;
}
*_retval = count;
return NS_OK;
@ -310,6 +327,7 @@ void nsGIFDecoder2::EndGIF()
mImageContainer->SetLoopCount(mGIFStruct.loop_count);
mImageContainer->DecodingComplete();
(void)mImageContainer->RestoreDataDone(); // Discard error code
mGIFOpen = PR_FALSE;
}

2
modules/libpr0n/decoders/gif/nsGIFDecoder2.h
View File

@ -68,7 +68,7 @@ public:
nsGIFDecoder2();
~nsGIFDecoder2();
nsresult ProcessData(unsigned char *data, PRUint32 count, PRUint32 *_retval);
nsresult ProcessData(const char *data, PRUint32 count, PRUint32 *_retval);
private:
/* These functions will be called when the decoder has a decoded row,