186216 r=paper sr=tor image decoders don't need to #include "nsIImage.h"

This commit is contained in:
cbiesinger%web.de 2002-12-21 15:34:01 +00:00
parent ac9e2f79e3
commit 0c55b1643c
7 changed files with 2 additions and 25 deletions

View File

@ -36,7 +36,6 @@ MODULE_NAME = nsBMPModule
REQUIRES = xpcom \
gfx \
imglib2 \
string \
$(NULL)
CPPSRCS = nsBMPDecoder.cpp nsICODecoder.cpp

View File

@ -46,14 +46,11 @@
#include "nsIInputStream.h"
#include "nsIComponentManager.h"
#include "nsIImage.h"
#include "nsMemory.h"
#include "imgIContainerObserver.h"
#include "nsRect.h"
#include "imgILoad.h"
#include "ImageLogging.h"
#include "prlog.h"
PRLogModuleInfo *gBMPLog = PR_NewLogModule("BMPDecoder");

View File

@ -43,16 +43,10 @@
#include "nsIInputStream.h"
#include "nsIComponentManager.h"
#include "nsIImage.h"
#include "nsMemory.h"
#include "imgIContainerObserver.h"
#include "nsRect.h"
#include "nsCRT.h"
#include "imgILoad.h"
#include "prcpucfg.h" // To get IS_LITTLE_ENDIAN / IS_BIG_ENDIAN
NS_IMPL_ISUPPORTS1(nsICODecoder, imgIDecoder)
#define ICONCOUNTOFFSET 4

View File

@ -24,7 +24,6 @@
#include "nsGIFDecoder2.h"
#include "nsIInputStream.h"
#include "nsIComponentManager.h"
#include "nsIImage.h"
#include "nsMemory.h"
#include "imgIContainerObserver.h"

View File

@ -27,7 +27,6 @@
#include "imgIContainer.h"
#include "imgIDecoderObserver.h"
#include "gfxIImageFrame.h"
#include "nsWeakReference.h"
#include "imgILoad.h"
#define NS_MNGDECODER_CID \

View File

@ -36,7 +36,6 @@ MODULE_NAME = nsXBMModule
REQUIRES = xpcom \
gfx \
imglib2 \
string \
$(NULL)
CPPSRCS = nsXBMDecoder.cpp

View File

@ -40,16 +40,12 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include "nsXBMDecoder.h"
#include "nsIInputStream.h"
#include "nsIComponentManager.h"
#include "nsIImage.h"
#include "nsMemory.h"
#include "imgIContainerObserver.h"
#include "nsRect.h"
#include "nsReadableUtils.h"
#include "imgILoad.h"
@ -198,12 +194,6 @@ nsresult nsXBMDecoder::ProcessData(const char* aData, PRUint32 aCount) {
}
}
if (mState == RECV_DATA) {
#if defined(XP_MAC) || defined(XP_MACOSX)
// bytes per pixel
const PRUint32 bpp = 4;
#else
const PRUint32 bpp = 3;
#endif
PRUint32 bpr;
mFrame->GetImageBytesPerRow(&bpr);
PRUint32 abpr;