From 98d5d5bbde4d4390fca545d85336dce61ecf853d Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Wed, 18 Sep 2002 05:22:35 +0000 Subject: [PATCH] remove these bogus files as they are causing bustage git-svn-id: svn://10.0.0.236/trunk@129881 18797224-902f-48f8-a5cc-f745e15eee43 --- .../libpr0n/decoders/ijpeg/makefile.win | 50 --- .../libpr0n/decoders/ijpeg/nsJPEGDecoder.cpp | 346 ------------------ .../libpr0n/decoders/ijpeg/nsJPEGDecoder.h | 67 ---- .../libpr0n/decoders/ijpeg/nsJPEGFactory.cpp | 42 --- 4 files changed, 505 deletions(-) delete mode 100644 mozilla/modules/libpr0n/decoders/ijpeg/makefile.win delete mode 100644 mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.cpp delete mode 100644 mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.h delete mode 100644 mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGFactory.cpp diff --git a/mozilla/modules/libpr0n/decoders/ijpeg/makefile.win b/mozilla/modules/libpr0n/decoders/ijpeg/makefile.win deleted file mode 100644 index 6c4b1d2a8fb..00000000000 --- a/mozilla/modules/libpr0n/decoders/ijpeg/makefile.win +++ /dev/null @@ -1,50 +0,0 @@ -#!nmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is mozilla.org code -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 2002 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# Stuart Parmenter -# - -DEPTH=..\..\..\.. -MODULE = imgjpeg -REQUIRES = xpcom \ - string \ - gfx \ - gfx2 \ - imglib2 \ - jpeg \ - $(NULL) -include <$(DEPTH)/config/config.mak> - -LIBRARY_NAME = imgijpeg -MODULE_NAME = nsJPEGDecoderModule - -OBJS = \ - .\$(OBJDIR)\nsJPEGDecoder.obj \ - .\$(OBJDIR)\nsJPEGFactory.obj \ - $(NULL) - -LLIBS=\ - $(LIBNSPR) \ - $(DIST)\lib\ijl15.lib \ - $(DIST)\lib\xpcom.lib \ - $(DIST)\lib\gkgfx.lib \ - $(NULL) - -include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.cpp b/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.cpp deleted file mode 100644 index 43c55fca782..00000000000 --- a/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.cpp +++ /dev/null @@ -1,346 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2002 Netscape Communications Corporation. - * All Rights Reserved. - * - * Contributor(s): - * Stuart Parmenter - * - */ - -#include "nsJPEGDecoder.h" - -#include "imgIContainerObserver.h" - -#include "nsIComponentManager.h" -#include "nsIInputStream.h" - -#include "nspr.h" -#include "nsCRT.h" - -NS_IMPL_ISUPPORTS1(nsJPEGDecoder, imgIDecoder) - - -nsJPEGDecoder::nsJPEGDecoder() -{ - NS_INIT_ISUPPORTS(); - - ZeroMemory(&mJPEG, sizeof(JPEG_CORE_PROPERTIES)); -} - -nsJPEGDecoder::~nsJPEGDecoder() -{ -} - - -/** imgIDecoder methods **/ - -/* void init (in imgILoad aLoad); */ -NS_IMETHODIMP nsJPEGDecoder::Init(imgILoad *aLoad) -{ - mImageLoad = aLoad; - mObserver = do_QueryInterface(aLoad); - - /* Step 1: allocate and initialize JPEG decompression object */ - - if (ijlInit(&mJPEG) != IJL_OK) { - return NS_ERROR_FAILURE; - } - - return NS_OK; -} - - -/* void close (); */ -NS_IMETHODIMP nsJPEGDecoder::Close() -{ - ijlFree(&mJPEG); - - return NS_OK; -} - -/* void flush (); */ -NS_IMETHODIMP nsJPEGDecoder::Flush() -{ - return NS_OK; -} - -/* unsigned long writeFrom (in nsIInputStream inStr, in unsigned long count); */ -NS_IMETHODIMP nsJPEGDecoder::WriteFrom(nsIInputStream *inStr, PRUint32 count, PRUint32 *_retval) -{ - -#if 0 - nsresult error_code = NS_ERROR_FAILURE; - /* Return here if there is a fatal error. */ - if ((error_code = setjmp(mErr.setjmp_buffer)) != 0) { - return error_code; - } - - PR_LOG(gJPEGlog, PR_LOG_DEBUG, - ("[this=%p] nsJPEGDecoder::WriteFrom -- processing JPEG data\n", this)); - - switch (mState) { - case JPEG_HEADER: - { - LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_HEADER case"); - - /* Step 3: read file parameters with jpeg_read_header() */ - if (jpeg_read_header(&mInfo, TRUE) == JPEG_SUSPENDED) - return NS_OK; /* I/O suspension */ - - /* - * Don't allocate a giant and superfluous memory buffer - * when the image is a sequential JPEG. - */ - mInfo.buffered_image = jpeg_has_multiple_scans(&mInfo); - - /* Used to set up image size so arrays can be allocated */ - jpeg_calc_output_dimensions(&mInfo); - - mObserver->OnStartDecode(nsnull, nsnull); - - /* we only support jpegs with 1 or 3 components currently. */ - if (mInfo.output_components != 1 && - mInfo.output_components != 3) { - mState = JPEG_ERROR; - return NS_ERROR_UNEXPECTED; - } - - /* Check if the request already has an image container. - this is the case when multipart/x-mixed-replace is being downloaded - if we already have one and it has the same width and height, reuse it. - */ - mImageLoad->GetImage(getter_AddRefs(mImage)); - if (mImage) { - PRInt32 width, height; - mImage->GetWidth(&width); - mImage->GetHeight(&height); - if ((width != (PRInt32)mInfo.image_width) || - (height != (PRInt32)mInfo.image_height)) { - mImage = nsnull; - } - } - - if (!mImage) { - mImage = do_CreateInstance("@mozilla.org/image/container;1"); - if (!mImage) { - mState = JPEG_ERROR; - return NS_ERROR_OUT_OF_MEMORY; - } - mImageLoad->SetImage(mImage); - mImage->Init(mInfo.image_width, mInfo.image_height, mObserver); - } - - mObserver->OnStartContainer(nsnull, nsnull, mImage); - - mImage->GetFrameAt(0, getter_AddRefs(mFrame)); - - PRBool createNewFrame = PR_TRUE; - - if (mFrame) { - PRInt32 width, height; - mFrame->GetWidth(&width); - mFrame->GetHeight(&height); - - if ((width == (PRInt32)mInfo.image_width) && - (height == (PRInt32)mInfo.image_height)) { - createNewFrame = PR_FALSE; - } else { - mImage->Clear(); - } - } - - if (createNewFrame) { - mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2"); - if (!mFrame) { - mState = JPEG_ERROR; - return NS_ERROR_OUT_OF_MEMORY; - } - - gfx_format format = gfxIFormats::RGB; -#if defined(XP_PC) || defined(XP_BEOS) - format = gfxIFormats::BGR; -#endif - - mFrame->Init(0, 0, mInfo.image_width, mInfo.image_height, format); - mImage->AppendFrame(mFrame); - } - - mObserver->OnStartFrame(nsnull, nsnull, mFrame); - - /* - * Make a one-row-high sample array that will go away - * when done with image. Always make it big enough to - * hold an RGB row. Since this uses the IJG memory - * manager, it must be allocated before the call to - * jpeg_start_compress(). - */ - int row_stride; - - if (mInfo.output_components == 1) - row_stride = mInfo.output_width; - else - row_stride = mInfo.output_width * 4; // use 4 instead of mInfo.output_components - // so we don't have to fuss with byte alignment. - // Mac wants 4 anyways. - - mSamples = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo, - JPOOL_IMAGE, - row_stride, 1); - -#if defined(XP_PC) || defined(XP_BEOS) || defined(XP_MAC) || defined(XP_MACOSX) || defined(MOZ_WIDGET_PHOTON) - // allocate buffer to do byte flipping if needed - if (mInfo.output_components == 3) { - mRGBPadRow = (PRUint8*) PR_MALLOC(row_stride); - mRGBPadRowLength = row_stride; - memset(mRGBPadRow, 0, mRGBPadRowLength); - } -#endif - - /* Allocate RGB buffer for conversion from greyscale. */ - if (mInfo.output_components != 3) { - row_stride = mInfo.output_width * 4; - mSamples3 = (*mInfo.mem->alloc_sarray)((j_common_ptr) &mInfo, - JPOOL_IMAGE, - row_stride, 1); - } - - mState = JPEG_START_DECOMPRESS; - } - case JPEG_START_DECOMPRESS: - { - LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_START_DECOMPRESS case"); - /* Step 4: set parameters for decompression */ - - /* FIXME -- Should reset dct_method and dither mode - * for final pass of progressive JPEG - */ - mInfo.dct_method = JDCT_ISLOW; - mInfo.dither_mode = JDITHER_FS; - mInfo.do_fancy_upsampling = FALSE; - mInfo.enable_2pass_quant = FALSE; - mInfo.do_block_smoothing = TRUE; - - /* Step 5: Start decompressor */ - if (jpeg_start_decompress(&mInfo) == FALSE) - return NS_OK; /* I/O suspension */ - - /* If this is a progressive JPEG ... */ - if (mInfo.buffered_image) { - mState = JPEG_DECOMPRESS_PROGRESSIVE; - } else { - mState = JPEG_DECOMPRESS_SEQUENTIAL; - } - - } - - case JPEG_DECOMPRESS_SEQUENTIAL: - { - if (mState == JPEG_DECOMPRESS_SEQUENTIAL) - { - LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_SEQUENTIAL case"); - - if (OutputScanlines(-1) == PR_FALSE) - return NS_OK; /* I/O suspension */ - - /* If we've completed image output ... */ - NS_ASSERTION(mInfo.output_scanline == mInfo.output_height, "We didn't process all of the data!"); - mState = JPEG_DONE; - } - } - - - case JPEG_DECOMPRESS_PROGRESSIVE: - { - if (mState == JPEG_DECOMPRESS_PROGRESSIVE) - { - LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- JPEG_DECOMPRESS_PROGRESSIVE case"); - - int status; - do { - status = jpeg_consume_input(&mInfo); - } while (!((status == JPEG_SUSPENDED) || - (status == JPEG_REACHED_EOI))); - - switch (status) { - case JPEG_REACHED_EOI: - // End of image - mState = JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT; - break; - case JPEG_SUSPENDED: - PR_LOG(gJPEGlog, PR_LOG_DEBUG, - ("[this=%p] nsJPEGDecoder::WriteFrom -- suspending\n", this)); - - return NS_OK; /* I/O suspension */ - default: - { -#ifdef DEBUG - printf("got someo other state!?\n"); -#endif - } - } - } - } - - case JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT: - { - if (mState == JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT) - { - LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_FINAL_PROGRESSIVE_SCAN_OUTPUT case"); - - // XXX progressive? ;) - // not really progressive according to the state machine... -saari - jpeg_start_output(&mInfo, mInfo.input_scan_number); - if (OutputScanlines(-1) == PR_FALSE) - return NS_OK; /* I/O suspension */ - jpeg_finish_output(&mInfo); - mState = JPEG_DONE; - } - } - - case JPEG_DONE: - { - LOG_SCOPE(gJPEGlog, "nsJPEGDecoder::WriteFrom -- entering JPEG_DONE case"); - - /* Step 7: Finish decompression */ - - if (jpeg_finish_decompress(&mInfo) == FALSE) - return NS_OK; /* I/O suspension */ - - mState = JPEG_SINK_NON_JPEG_TRAILER; - - /* we're done dude */ - break; - } - case JPEG_SINK_NON_JPEG_TRAILER: - PR_LOG(gJPEGlog, PR_LOG_DEBUG, - ("[this=%p] nsJPEGDecoder::WriteFrom -- entering JPEG_SINK_NON_JPEG_TRAILER case\n", this)); - - break; - - case JPEG_ERROR: - PR_LOG(gJPEGlog, PR_LOG_DEBUG, - ("[this=%p] nsJPEGDecoder::WriteFrom -- entering JPEG_ERROR case\n", this)); - - break; - } - -#endif - - return NS_OK; -} - diff --git a/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.h b/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.h deleted file mode 100644 index 870ffd3bf15..00000000000 --- a/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGDecoder.h +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2002 Netscape Communications Corporation. - * All Rights Reserved. - * - * Contributor(s): - * Stuart Parmenter - */ - -#ifndef nsJPEGDecoder_h__ -#define nsJPEGDecoder_h__ - -#include "imgIDecoder.h" - -#include "nsCOMPtr.h" - -#include "imgIContainer.h" -#include "gfxIImageFrame.h" -#include "imgIDecoderObserver.h" -#include "imgILoad.h" -#include "nsIInputStream.h" -#include "nsIPipe.h" - -#include "ijl.h" - -#define NS_JPEGDECODER_CID \ -{ /* 7e309b88-1dd2-11b2-815c-e8f8b7653393 */ \ - 0x7e309b88, \ - 0x1dd2, \ - 0x11b2, \ - {0x81, 0x5c, 0xe8, 0xf8, 0xb7, 0x65, 0x33, 0x93} \ -} - -class nsJPEGDecoder : public imgIDecoder -{ -public: - NS_DECL_ISUPPORTS - NS_DECL_IMGIDECODER - - nsJPEGDecoder(); - virtual ~nsJPEGDecoder(); - -public: - nsCOMPtr mImage; - nsCOMPtr mImageLoad; - nsCOMPtr mFrame; - - nsCOMPtr mObserver; - - JPEG_CORE_PROPERTIES mJPEG; -}; - -#endif // nsJPEGDecoder_h__ diff --git a/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGFactory.cpp b/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGFactory.cpp deleted file mode 100644 index 28e5288c80d..00000000000 --- a/mozilla/modules/libpr0n/decoders/ijpeg/nsJPEGFactory.cpp +++ /dev/null @@ -1,42 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2001 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * Stuart Parmenter - */ - -#include "nsIGenericFactory.h" -#include "nsIModule.h" - -#include "nsJPEGDecoder.h" - -// objects that just require generic constructors - -NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGDecoder) - -static nsModuleComponentInfo components[] = -{ - { "ppm decoder", - NS_JPEGDECODER_CID, - "@mozilla.org/image/decoder;2?type=image/jpeg", - nsJPEGDecoderConstructor, }, -}; - -NS_IMPL_NSGETMODULE(nsJPEGDecoderModule, components) -