Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for bug 77962 r=dbaron sr=blizzard

Browse Source
This commit is contained in:
pavlov%netscape.com 2001-04-30 23:00:02 +00:00
parent 896be6d1f1
commit 2bae74fb15
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/libpr0n/decoders/jpeg/nsJPEGDecoder.cpp
View File

@ -139,12 +139,13 @@ NS_IMETHODIMP nsJPEGDecoder::Init(imgIRequest *aRequest)
decoder_source_mgr *src;
if (mInfo.src == NULL) {
//mInfo.src = PR_NEWZAP(decoder_source_mgr);
src = PR_NEWZAP(decoder_source_mgr);
if (!src) {
return PR_FALSE;
mState = JPEG_ERROR;
return NS_ERROR_OUT_OF_MEMORY;
}
mInfo.src = (struct jpeg_source_mgr *) src;
mInfo.src = NS_REINTERPRET_CAST(struct jpeg_source_mgr *, src);
}
/* Step 2: specify data source (eg, a file) */
@ -176,8 +177,10 @@ NS_IMETHODIMP nsJPEGDecoder::Close()
NS_WARNING("Never finished decoding the JPEG.");
/* Step 8: Release JPEG decompression object */
decoder_source_mgr *src = NS_REINTERPRET_CAST(decoder_source_mgr *, mInfo.src);
PR_FREEIF(src);
mInfo.src = nsnull;
/* This is an important step since it will release a good deal of memory. */
jpeg_destroy_decompress(&mInfo);
return NS_OK;
@ -189,7 +192,7 @@ NS_IMETHODIMP nsJPEGDecoder::Flush()
LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::Flush");
PRUint32 ret;
if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER)
if (mState != JPEG_DONE && mState != JPEG_SINK_NON_JPEG_TRAILER && mState != JPEG_ERROR)
return this->WriteFrom(nsnull, 0, &ret);
return NS_OK;
@ -231,12 +234,9 @@ NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PR
return error_code;
}
PR_LOG(gJPEGlog, PR_LOG_DEBUG,
("[this=%p] nsJPEGDecoder::WriteFrom -- processing JPEG data\n", this));
decoder_source_mgr *src = NS_REINTERPRET_CAST(decoder_source_mgr *, mInfo.src);
switch (mState) {
case JPEG_HEADER:
{

10
modules/libpr0n/src/imgRequest.cpp
View File

@ -741,7 +741,15 @@ NS_IMETHODIMP imgRequest::OnDataAvailable(nsIRequest *aRequest, nsISupports *ctx
return NS_IMAGELIB_ERROR_NO_DECODER;
}
mDecoder->Init(NS_STATIC_CAST(imgIRequest*, this));
nsresult rv = mDecoder->Init(NS_STATIC_CAST(imgIRequest*, this));
if (NS_FAILED(rv)) {
PR_LOG(gImgLog, PR_LOG_WARNING,
("[this=%p] imgRequest::OnDataAvailable -- mDecoder->Init failed\n", this));
this->Cancel(NS_BINDING_ABORTED);
return NS_BINDING_ABORTED;
}
}
if (!mDecoder) {