[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:12:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 5d63071c3ce731d9554b3f79b0d035eec1e28be9
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 14 00:27:50 2002 +0000
Removed libjpeg dependency. Turns out we don't need it.
* configure.in: Don't check for libjpeg.
* Updates/update: Don't bother with the libjpeg update.
* Updates/install-libjpeg.sh: Removed.
WebCore:
Removed libjpeg dependency. Turns out we don't need it.
* Makefile.am: Remove -ljpeg from link line.
* khtml/misc/loader_jpeg.cpp: Removed.
* khtml/misc/loader_jpeg.h: Removed.
* khtml/misc/Makefile.am: Remve loader_jpeg from build.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index ca4d704..fd8ad8d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-13 Maciej Stachowiak <mjs at apple.com>
+
+ Removed libjpeg dependency. Turns out we don't need it.
+
+ * Makefile.am: Remove -ljpeg from link line.
+ * khtml/misc/loader_jpeg.cpp: Removed.
+ * khtml/misc/loader_jpeg.h: Removed.
+ * khtml/misc/Makefile.am: Remve loader_jpeg from build.
+
2002-05-10 Richard J. Williamson <rjw at apple.com>
Made log output match webkit logging.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ca4d704..fd8ad8d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-05-13 Maciej Stachowiak <mjs at apple.com>
+
+ Removed libjpeg dependency. Turns out we don't need it.
+
+ * Makefile.am: Remove -ljpeg from link line.
+ * khtml/misc/loader_jpeg.cpp: Removed.
+ * khtml/misc/loader_jpeg.h: Removed.
+ * khtml/misc/Makefile.am: Remve loader_jpeg from build.
+
2002-05-10 Richard J. Williamson <rjw at apple.com>
Made log output match webkit logging.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ca4d704..fd8ad8d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-05-13 Maciej Stachowiak <mjs at apple.com>
+
+ Removed libjpeg dependency. Turns out we don't need it.
+
+ * Makefile.am: Remove -ljpeg from link line.
+ * khtml/misc/loader_jpeg.cpp: Removed.
+ * khtml/misc/loader_jpeg.h: Removed.
+ * khtml/misc/Makefile.am: Remve loader_jpeg from build.
+
2002-05-10 Richard J. Williamson <rjw at apple.com>
Made log output match webkit logging.
diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index 465aff7..fa6518e 100644
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -15,7 +15,6 @@ libwebcoreunstripped_dylib_SOURCES = \
libwebcoreunstripped_dylib_LIBADD = \
./khtml/libkhtml.o \
./kwq/libkwq.o \
- -ljpeg \
$(NULL)
LIBWEBCORE_INSTALL_PATH = @executable_path/../Frameworks
diff --git a/WebCore/khtml/misc/Makefile.am b/WebCore/khtml/misc/Makefile.am
index 287c32b..c8e03a7 100644
--- a/WebCore/khtml/misc/Makefile.am
+++ b/WebCore/khtml/misc/Makefile.am
@@ -17,8 +17,6 @@ libkhtmlmisc_o_SOURCES = \
khtmllayout.h \
loader.h \
loader_client.h \
- loader_jpeg.cpp \
- loader_jpeg.h \
stringit.h \
$(NULL)
diff --git a/WebCore/khtml/misc/loader_jpeg.cpp b/WebCore/khtml/misc/loader_jpeg.cpp
deleted file mode 100644
index 949e2dd..0000000
--- a/WebCore/khtml/misc/loader_jpeg.cpp
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- This file is part of the KDE libraries
-
- Copyright (C) 2000 Dirk Mueller (mueller at kde.org)
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_LIBJPEG
-#include "loader_jpeg.h"
-
-#include <stdio.h>
-#include <setjmp.h>
-#include <qdatetime.h>
-
-extern "C" {
-#define XMD_H
-#include <jpeglib.h>
-#undef const
-}
-
-
-#undef BUFFER_DEBUG
-//#define BUFFER_DEBUG
-
-#undef JPEG_DEBUG
-//#define JPEG_DEBUG
-
-// -----------------------------------------------------------------------------
-
-struct khtml_error_mgr : public jpeg_error_mgr {
- jmp_buf setjmp_buffer;
-};
-
-extern "C" {
-
- static
- void khtml_error_exit (j_common_ptr cinfo)
- {
- khtml_error_mgr* myerr = (khtml_error_mgr*) cinfo->err;
- char buffer[JMSG_LENGTH_MAX];
- (*cinfo->err->format_message)(cinfo, buffer);
- qWarning(buffer);
- longjmp(myerr->setjmp_buffer, 1);
- }
-}
-
-static const int max_buf = 8192;
-static const int max_consumingtime = 500;
-
-struct khtml_jpeg_source_mgr : public jpeg_source_mgr {
- JOCTET buffer[max_buf];
-
- int valid_buffer_len;
- unsigned int skip_input_bytes;
- int ateof;
- QTime decoder_timestamp;
- bool final_pass;
- bool decoding_done;
-
-public:
- khtml_jpeg_source_mgr();
-};
-
-
-extern "C" {
-
- static
- void khtml_j_decompress_dummy(j_decompress_ptr)
- {
- }
-
- static
- boolean khtml_fill_input_buffer(j_decompress_ptr cinfo)
- {
-#ifdef BUFFER_DEBUG
- qDebug("khtml_fill_input_buffer called!");
-#endif
-
- khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
-
- if ( src->ateof )
- {
- /* Insert a fake EOI marker - as per jpeglib recommendation */
- src->buffer[0] = (JOCTET) 0xFF;
- src->buffer[1] = (JOCTET) JPEG_EOI;
- src->bytes_in_buffer = 2;
-#ifdef BUFFER_DEBUG
- qDebug("...returning TRUE!");
-#endif
- return TRUE;
- }
- else
- return FALSE; /* I/O suspension mode */
- }
-
- static
- void khtml_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
- {
- if(num_bytes <= 0)
- return; /* required noop */
-
-#ifdef BUFFER_DEBUG
- qDebug("khtml_skip_input_data (%d) called!", num_bytes);
-#endif
-
- khtml_jpeg_source_mgr* src = (khtml_jpeg_source_mgr*)cinfo->src;
- src->skip_input_bytes += num_bytes;
-
- unsigned int skipbytes = QMIN(src->bytes_in_buffer, src->skip_input_bytes);
-
-#ifdef BUFFER_DEBUG
- qDebug("skip_input_bytes is now %d", src->skip_input_bytes);
- qDebug("skipbytes is now %d", skipbytes);
- qDebug("valid_buffer_len is before %d", src->valid_buffer_len);
- qDebug("bytes_in_buffer is %d", src->bytes_in_buffer);
-#endif
-
- if(skipbytes < src->bytes_in_buffer)
- memcpy(src->buffer, src->next_input_byte+skipbytes, src->bytes_in_buffer - skipbytes);
-
- src->bytes_in_buffer -= skipbytes;
- src->valid_buffer_len = src->bytes_in_buffer;
- src->skip_input_bytes -= skipbytes;
-
- /* adjust data for jpeglib */
- cinfo->src->next_input_byte = (JOCTET *) src->buffer;
- cinfo->src->bytes_in_buffer = (size_t) src->valid_buffer_len;
-#ifdef BUFFER_DEBUG
- qDebug("valid_buffer_len is afterwards %d", src->valid_buffer_len);
- qDebug("skip_input_bytes is now %d", src->skip_input_bytes);
-#endif
- }
-}
-
-
-khtml_jpeg_source_mgr::khtml_jpeg_source_mgr()
-{
- jpeg_source_mgr::init_source = khtml_j_decompress_dummy;
- jpeg_source_mgr::fill_input_buffer = khtml_fill_input_buffer;
- jpeg_source_mgr::skip_input_data = khtml_skip_input_data;
- jpeg_source_mgr::resync_to_restart = jpeg_resync_to_restart;
- jpeg_source_mgr::term_source = khtml_j_decompress_dummy;
- bytes_in_buffer = 0;
- valid_buffer_len = 0;
- skip_input_bytes = 0;
- ateof = 0;
- next_input_byte = buffer;
- final_pass = false;
- decoding_done = false;
-}
-
-
-
-// -----------------------------------------------------------------------------
-
-class KJPEGFormat : public QImageFormat
-{
-public:
- KJPEGFormat();
-
- virtual ~KJPEGFormat();
-
- virtual int decode(QImage& img, QImageConsumer* consumer,
- const uchar* buffer, int length);
-private:
-
- enum {
- Init,
- readHeader,
- startDecompress,
- decompressStarted,
- consumeInput,
- prepareOutputScan,
- doOutputScan,
- readDone,
- invalid
- } state;
-
- // structs for the jpeglib
- struct jpeg_decompress_struct cinfo;
- struct khtml_error_mgr jerr;
- struct khtml_jpeg_source_mgr jsrc;
-};
-
-
-// -----------------------------------------------------------------------------
-
-KJPEGFormat::KJPEGFormat()
-{
- memset(&cinfo, 0, sizeof(cinfo));
- cinfo.err = jpeg_std_error(&jerr);
- jpeg_create_decompress(&cinfo);
- cinfo.err = jpeg_std_error(&jerr);
- jerr.error_exit = khtml_error_exit;
- cinfo.src = &jsrc;
- state = Init;
-}
-
-
-KJPEGFormat::~KJPEGFormat()
-{
- jpeg_destroy_decompress(&cinfo);
-}
-
-/*
- * return > 0 means "consumed x bytes, need more"
- * return == 0 means "end of frame reached"
- * return < 0 means "fatal error in image decoding, don't call me ever again"
- */
-
-int KJPEGFormat::decode(QImage& image, QImageConsumer* consumer, const uchar* buffer, int length)
-{
-#ifdef JPEG_DEBUG
- qDebug("KJPEGFormat::decode(%08lx, %08lx, %08lx, %d)",
- &image, consumer, buffer, length);
-#endif
-
- if(jsrc.ateof) {
-#ifdef JPEG_DEBUG
- qDebug("ateof, eating");
-#endif
- return length;
- }
-
-
- if(setjmp(jerr.setjmp_buffer))
- {
-#ifdef JPEG_DEBUG
- qDebug("jump into state invalid");
-#endif
- if(consumer)
- consumer->end();
-
- // this is fatal
- return -1;
- }
-
- int consumed = QMIN(length, max_buf - jsrc.valid_buffer_len);
-
-#ifdef BUFFER_DEBUG
- qDebug("consuming %d bytes", consumed);
-#endif
-
- // filling buffer with the new data
- memcpy(jsrc.buffer + jsrc.valid_buffer_len, buffer, consumed);
- jsrc.valid_buffer_len += consumed;
-
- if(jsrc.skip_input_bytes)
- {
-#ifdef BUFFER_DEBUG
- qDebug("doing skipping");
- qDebug("valid_buffer_len %d", jsrc.valid_buffer_len);
- qDebug("skip_input_bytes %d", jsrc.skip_input_bytes);
-#endif
- int skipbytes = QMIN((unsigned) jsrc.valid_buffer_len, jsrc.skip_input_bytes);
-
- if(skipbytes < jsrc.valid_buffer_len)
- memcpy(jsrc.buffer, jsrc.buffer+skipbytes, jsrc.valid_buffer_len - skipbytes);
-
- jsrc.valid_buffer_len -= skipbytes;
- jsrc.skip_input_bytes -= skipbytes;
-
- // still more bytes to skip
- if(jsrc.skip_input_bytes) {
- if(consumed <= 0) qDebug("ERROR!!!");
- return consumed;
- }
-
- }
-
- cinfo.src->next_input_byte = (JOCTET *) jsrc.buffer;
- cinfo.src->bytes_in_buffer = (size_t) jsrc.valid_buffer_len;
-
-#ifdef BUFFER_DEBUG
- qDebug("buffer contains %d bytes", jsrc.valid_buffer_len);
-#endif
-
- if(state == Init)
- {
- if(jpeg_read_header(&cinfo, TRUE) != JPEG_SUSPENDED) {
- if ( consumer )
- consumer->setSize(cinfo.output_width, cinfo.output_height);
-
- state = startDecompress;
- }
- }
-
- if(state == startDecompress)
- {
- cinfo.buffered_image = TRUE;
- cinfo.do_fancy_upsampling = FALSE;
- cinfo.do_block_smoothing = FALSE;
- cinfo.dct_method = JDCT_FASTEST;
-
- // FALSE: IO suspension
- if(jpeg_start_decompress(&cinfo)) {
- if ( cinfo.output_components == 3 || cinfo.output_components == 4) {
- image.create( cinfo.output_width, cinfo.output_height, 32 );
- } else if ( cinfo.output_components == 1 ) {
- image.create( cinfo.output_width, cinfo.output_height, 8, 256 );
- for (int i=0; i<256; i++)
- image.setColor(i, qRgb(i,i,i));
- }
-
-#ifdef JPEG_DEBUG
- qDebug("will create a picture %d/%d in size", cinfo.output_width, cinfo.output_height);
-#endif
-
-#ifdef JPEG_DEBUG
- qDebug("ok, going to decompressStarted");
-#endif
-
- jsrc.decoder_timestamp.start();
- state = decompressStarted;
- }
- }
-
- if(state == decompressStarted) {
- state = (!jsrc.final_pass && jsrc.decoder_timestamp.elapsed() < max_consumingtime)
- ? consumeInput : prepareOutputScan;
- }
-
- if(state == consumeInput)
- {
- int retval;
-
- do {
- retval = jpeg_consume_input(&cinfo);
- } while (retval != JPEG_SUSPENDED && retval != JPEG_REACHED_EOI);
-
- if(jsrc.decoder_timestamp.elapsed() > max_consumingtime || jsrc.final_pass ||
- retval == JPEG_REACHED_EOI || retval == JPEG_REACHED_SOS)
- state = prepareOutputScan;
- else
- state = consumeInput;
- }
-
- if(state == prepareOutputScan)
- {
- jsrc.decoder_timestamp.restart();
- cinfo.buffered_image = TRUE;
- jpeg_start_output(&cinfo, cinfo.input_scan_number);
- state = doOutputScan;
- }
-
- if(state == doOutputScan)
- {
- if(image.isNull() || jsrc.decoding_done)
- {
-#ifdef JPEG_DEBUG
- qDebug("complete in doOutputscan, eating..");
-#endif
- return consumed;
- }
- uchar** lines = image.jumpTable();
- int oldoutput_scanline = cinfo.output_scanline;
-
- while(cinfo.output_scanline < cinfo.output_height &&
- jpeg_read_scanlines(&cinfo, lines+cinfo.output_scanline, cinfo.output_height))
- ; // here happens all the magic of decoding
-
- int completed_scanlines = cinfo.output_scanline - oldoutput_scanline;
-#ifdef JPEG_DEBUG
- qDebug("completed now %d scanlines", completed_scanlines);
-#endif
-
- if ( cinfo.output_components == 3 ) {
- // Expand 24->32 bpp.
- for (int j=oldoutput_scanline; j<oldoutput_scanline+completed_scanlines; j++) {
- uchar *in = image.scanLine(j) + cinfo.output_width * 3;
- QRgb *out = (QRgb*)image.scanLine(j);
-
- for (uint i=cinfo.output_width; i--; ) {
- in-=3;
- out[i] = qRgb(in[0], in[1], in[2]);
- }
- }
- }
-
- if(consumer && completed_scanlines)
- {
- QRect r(0, oldoutput_scanline, cinfo.output_width, completed_scanlines);
-#ifdef JPEG_DEBUG
- qDebug("changing %d/%d %d/%d", r.x(), r.y(), r.width(), r.height());
-#endif
- consumer->changed(r);
- }
-
- if(cinfo.output_scanline >= cinfo.output_height)
- {
- jpeg_finish_output(&cinfo);
- jsrc.final_pass = jpeg_input_complete(&cinfo);
- jsrc.decoding_done = jsrc.final_pass && cinfo.input_scan_number == cinfo.output_scan_number;
-
-#ifdef JPEG_DEBUG
- qDebug("one pass is completed, final_pass = %d, dec_done: %d, complete: %d",
- jsrc.final_pass, jsrc.decoding_done, jpeg_input_complete(&cinfo));
-#endif
- if(!jsrc.decoding_done)
- {
-#ifdef JPEG_DEBUG
- qDebug("starting another one, input_scan_number is %d/%d", cinfo.input_scan_number,
- cinfo.output_scan_number);
-#endif
- // don't return until necessary!
- jsrc.decoder_timestamp.restart();
- state = decompressStarted;
- }
- }
-
- if(state == doOutputScan && jsrc.decoding_done) {
-#ifdef JPEG_DEBUG
- qDebug("input is complete, cleaning up, returning..");
-#endif
- (void) jpeg_finish_decompress(&cinfo);
- (void) jpeg_destroy_decompress(&cinfo);
-
- if(consumer)
- consumer->end();
-
- jsrc.ateof = true;
-
- return 0;
- }
- }
-
-#ifdef BUFFER_DEBUG
- qDebug("valid_buffer_len is now %d", jsrc.valid_buffer_len);
- qDebug("bytes_in_buffer is now %d", jsrc.bytes_in_buffer);
- qDebug("consumed %d bytes", consumed);
-#endif
- if(jsrc.bytes_in_buffer)
- memcpy(jsrc.buffer, jsrc.next_input_byte, jsrc.bytes_in_buffer);
- jsrc.valid_buffer_len = jsrc.bytes_in_buffer;
- return consumed;
-}
-
-// -----------------------------------------------------------------------------
-// This is the factory that teaches Qt about progressive JPEG's
-
-QImageFormat* khtml::KJPEGFormatType::decoderFor(const unsigned char* buffer, int length)
-{
- if(length < 3) return 0;
-
- if(buffer[0] == 0377 &&
- buffer[1] == 0330 &&
- buffer[2] == 0377)
- return new KJPEGFormat;
-
- return 0;
-}
-
-const char* khtml::KJPEGFormatType::formatName() const
-{
- return "JPEG";
-}
-
-#else
-#ifdef __GNUC__
-#warning You don't seem to have libJPEG. jpeg support in khtml won't work
-#endif
-#endif // HAVE_LIBJPEG
-
-// -----------------------------------------------------------------------------
-
diff --git a/WebCore/khtml/misc/loader_jpeg.h b/WebCore/khtml/misc/loader_jpeg.h
deleted file mode 100644
index c0d1568..0000000
--- a/WebCore/khtml/misc/loader_jpeg.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- This file is part of the KDE libraries
-
- Copyright (C) 2000 Dirk Mueller (mueller at kde.org)
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- This is a helper for progressive loading of JPEG's.
-*/
-
-#ifndef _khtml_loader_jpeg_h
-#define _khtml_loader_jpeg_h
-
-#include <qasyncimageio.h>
-
-namespace khtml
-{
- /**
- * @internal
- *
- * An incremental loader factory for JPEG's.
- */
- class KJPEGFormatType : public QImageFormatType
- {
- public:
- QImageFormat* decoderFor(const uchar* buffer, int length);
- const char* formatName() const;
- };
-
-};
-
-
-// -----------------------------------------------------------------------------
-
-#endif // _khtml_loader_jpeg_h
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list