Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change net/gfx/imglib buffer size. pnunn.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47706 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pnunn%netscape.com 1999-09-16 01:22:44 +00:00
parent 1ee388bccd
commit 45e6e3707d
9 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/gfx/src/nsImageNetContextAsync.cpp
View File

@ -262,8 +262,8 @@ ImageConsumer::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32
if(NS_FAILED(err)) //note length tells how much we already have.
break;
if(max_read <= 0){
max_read =128;
if(max_read < 0){
max_read = 128;
}
if (max_read > IMAGE_BUF_SIZE) {
@ -276,7 +276,7 @@ ImageConsumer::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32
break;
err = pIStream->Read(mBuffer,
IMAGE_BUF_SIZE, &nb);
max_read, &nb);
if (err == NS_BASE_STREAM_WOULD_BLOCK) {
err = NS_OK;
break;

4
mozilla/modules/libimg/gifcom/nsGIFDecoder.cpp
View File

@ -70,11 +70,11 @@ GIFDecoder::ImgDInit()
NS_IMETHODIMP
GIFDecoder::ImgDWriteReady(PRUint8 *min_read)
GIFDecoder::ImgDWriteReady(PRUint32 *max_read)
{
if(ilContainer != NULL) {
*min_read = il_gif_write_ready(ilContainer);
*max_read = il_gif_write_ready(ilContainer);
}
return NS_OK;
}

2
mozilla/modules/libimg/gifcom/nsGIFDecoder.h
View File

@ -49,7 +49,7 @@ public:
/* stream */
NS_IMETHOD ImgDInit();
NS_IMETHOD ImgDWriteReady(PRUint8 *modata);
NS_IMETHOD ImgDWriteReady(PRUint32 *max_read);
NS_IMETHOD ImgDWrite(const unsigned char *buf, int32 len);
NS_IMETHOD ImgDComplete();
NS_IMETHOD ImgDAbort();

7
mozilla/modules/libimg/jpgcom/nsJPGDecoder.cpp
View File

@ -54,7 +54,7 @@ public:
/* stream */
NS_IMETHOD ImgDInit();
NS_IMETHOD ImgDWriteReady(PRUint8 *modata);
NS_IMETHOD ImgDWriteReady(PRUint32 *max_read);
NS_IMETHOD ImgDWrite(const unsigned char *buf, int32 len);
NS_IMETHOD ImgDComplete();
NS_IMETHOD ImgDAbort();
@ -268,10 +268,11 @@ JPGDecoder::ImgDInit()
NS_IMETHODIMP
JPGDecoder::ImgDWriteReady(PRUint8 *max_read)
JPGDecoder::ImgDWriteReady(PRUint32 *max_read)
{
/* dummy return needed */
return NS_OK;
*max_read = 2048;
return NS_OK;
}
NS_IMETHODIMP

5
mozilla/modules/libimg/pngcom/nsPNGDecoder.cpp
View File

@ -54,7 +54,7 @@ public:
/* stream */
NS_IMETHOD ImgDInit();
NS_IMETHOD ImgDWriteReady(PRUint8 *modata);
NS_IMETHOD ImgDWriteReady(PRUint32 *max_read);
NS_IMETHOD ImgDWrite(const unsigned char *buf, int32 len);
NS_IMETHOD ImgDComplete();
NS_IMETHOD ImgDAbort();
@ -265,9 +265,10 @@ PNGDecoder::ImgDInit()
NS_IMETHODIMP
PNGDecoder::ImgDWriteReady(PRUint8 *modata)
PNGDecoder::ImgDWriteReady(PRUint32 *max_read)
{
/* dummy return needed */
*max_read = 2048;
return NS_OK;
}

2
mozilla/modules/libimg/public/ilINetReader.h
View File

@ -34,7 +34,7 @@ class ilIURL;
class ilINetReader : public nsISupports {
public:
NS_IMETHOD WriteReady(PRUint32 *chunksizep)=0;
NS_IMETHOD WriteReady(PRUint32 *max_read)=0;
NS_IMETHOD FirstWrite(const unsigned char *str, int32 len)=0;

2
mozilla/modules/libimg/public_com/nsIImgDecoder.h
View File

@ -37,7 +37,7 @@ public:
NS_IMETHOD ImgDInit()=0;
NS_IMETHOD ImgDWriteReady(PRUint8 *modata)=0;
NS_IMETHOD ImgDWriteReady(PRUint32 *max_read)=0;
NS_IMETHOD ImgDWrite(const unsigned char *buf, int32 len)=0;
NS_IMETHOD ImgDComplete()=0;
NS_IMETHOD ImgDAbort()=0;

8
mozilla/modules/libimg/src/if.cpp
View File

@ -837,17 +837,17 @@ int
IL_StreamWriteReady(il_container *ic)
{
nsresult rv= NS_ERROR_FAILURE;
PRUint8 max_read = 0;
PRUint32 max_read = 0;
if (ic->imgdec)
rv = ic->imgdec->ImgDWriteReady(&max_read);
if(NS_FAILED(rv))
return IL_OFFSCREEN_CHUNK;
if(max_read == 0)
return 0; //send no more data please
if(NS_FAILED(rv))
return 0; //IL_OFFSCREEN_CHUNK;
/*
* It could be that layout aborted image loading by calling IL_FreeImage
* before the netlib finished transferring data. Don't do anything.

10
mozilla/modules/libimg/src/ilNetReader.cpp
View File

@ -29,7 +29,7 @@ public:
NS_DECL_ISUPPORTS
NS_IMETHOD WriteReady(PRUint32 *chunksizep);
NS_IMETHOD WriteReady(PRUint32 *max_read);
NS_IMETHOD FirstWrite(const unsigned char *str, int32 len);
@ -66,12 +66,12 @@ NetReaderImpl::~NetReaderImpl()
NS_IMPL_ISUPPORTS(NetReaderImpl, kINetReaderIID)
NS_IMETHODIMP
NetReaderImpl::WriteReady(PRUint32* maxread)
NetReaderImpl::WriteReady(PRUint32* max_read)
{
if (ilContainer != NULL) {
*maxread =IL_StreamWriteReady(ilContainer);
if (*maxread < 0)
*maxread = 0;
*max_read =IL_StreamWriteReady(ilContainer);
if (*max_read < 0)
*max_read = 0;
}
return NS_OK;
}