Update to tip - not in build.

modules/libpr0n/decoders/mng/Makefile.in

@@ -26,10 +26,16 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE		= imgmng
 LIBRARY_NAME	= imgmng
+EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMNGDecoderModule
 
-REQUIRES	= $(MNG_REQUIRES) \
+REQUIRES	= xpcom \
+		  gfx \
+		  gfx2 \
+		  imglib2 \
+		  timer \
+		  $(MNG_REQUIRES) \
 		  $(JPEG_REQUIRES) \
 		  $(ZLIB_REQUIRES) \
 		  $(NULL)

modules/libpr0n/decoders/mng/makefile.win

@@ -22,20 +22,18 @@
 DEPTH=..\..\..\..
 MODULE		= imgmng
 REQUIRES	= xpcom \
-		  necko \
-		  imglib2 \
 		  gfx \
 		  gfx2 \
+		  imglib2 \
+		  timer \
 		  mng \
 		  jpeg \
-		  timer \
 		  zlib \
 		  $(NULL)
 include <$(DEPTH)/config/config.mak>
 
 LIBRARY_NAME	= imgmng
-DLL		= $(OBJDIR)\$(LIBRARY_NAME).dll
-MAKE_OBJ_TYPE	= DLL
+MODULE_NAME	= nsMNGDecoderModule
 
 OBJS	= \
 		.\$(OBJDIR)\nsMNGDecoder.obj \
@@ -53,11 +51,3 @@ LLIBS=\
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
-
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).dll $(DIST)\bin\components
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(LIBRARY_NAME).lib $(DIST)\lib
-
-clobber::
-	rm -f $(DIST)\bin\components\$(LIBRARY_NAME).dll
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

modules/libpr0n/decoders/mng/nsMNGDecoder.cpp

@@ -27,7 +27,7 @@
 //////////////////////////////////////////////////////////////////////////////
 // MNG Decoder Implementation
 
-NS_IMPL_ISUPPORTS2(nsMNGDecoder, imgIDecoder, nsIOutputStream);
+NS_IMPL_ISUPPORTS1(nsMNGDecoder, imgIDecoder);
 
 nsMNGDecoder::nsMNGDecoder()
 {
@@ -64,10 +64,6 @@ nsMNGDecoder::Init(imgILoad *aLoad)
   return NS_OK;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// nsIOutputStream methods 
-//////////////////////////////////////////////////////////////////////////////
-
 //////////////////////////////////////////////////////////////////////////////
 // void close (); 
 NS_IMETHODIMP
@@ -84,14 +80,6 @@ nsMNGDecoder::Flush()
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// unsigned long write (in string buf, in unsigned long count);
-NS_IMETHODIMP
-nsMNGDecoder::Write(const char *buf, PRUint32 count, PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 // unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count);
 NS_IMETHODIMP
@@ -103,41 +91,3 @@ nsMNGDecoder::WriteFrom(nsIInputStream *inStr,
   return NS_OK;
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// [noscript] unsigned long writeSegments (in nsReadSegmentFun reader, in voidPtr closure, in unsigned long count);
-NS_IMETHODIMP
-nsMNGDecoder::WriteSegments(nsReadSegmentFun reader,
-			    void * closure, 
-			    PRUint32 count,
-			    PRUint32 *_retval)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// attribute boolean nonBlocking;
-NS_IMETHODIMP
-nsMNGDecoder::GetNonBlocking(PRBool *aNonBlocking)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMNGDecoder::SetNonBlocking(PRBool aNonBlocking)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// attribute nsIOutputStreamObserver observer;
-NS_IMETHODIMP
-nsMNGDecoder::GetObserver(nsIOutputStreamObserver * *aObserver)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsMNGDecoder::SetObserver(nsIOutputStreamObserver * aObserver)
-{
-  return NS_ERROR_NOT_IMPLEMENTED;
-}

modules/libpr0n/decoders/mng/nsMNGDecoder.h

@@ -27,8 +27,8 @@
 #include "imgIContainer.h"
 #include "imgIDecoderObserver.h"
 #include "gfxIImageFrame.h"
-#include "imgIRequest.h"
 #include "nsWeakReference.h"
+#include "imgILoad.h"
 
 #define NS_MNGDECODER_CID \
 { /* d407782c-1dd1-11b2-9b49-dbe684d09cd8 */         \
@@ -46,7 +46,6 @@ class nsMNGDecoder : public imgIDecoder
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_IMGIDECODER
-  NS_DECL_NSIOUTPUTSTREAM
   
   nsMNGDecoder();
   virtual ~nsMNGDecoder();