[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:44:34 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 19012ac573d28b617c820afd86411fc88290a775
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 7 21:56:54 2001 +0000
Added support for khtml/misc/loader_jpeg.cpp
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/configure b/WebCore/configure
index 5c7a904..2e563d1 100644
--- a/WebCore/configure
+++ b/WebCore/configure
@@ -1621,7 +1621,7 @@ EOF
fi
-for ac_hdr in sys/param.h sys/mman.h sys/time.h sys/cdefs.h fnmatch.h sysent.h strings.h sys/stat.h sys/select.h sys/socket.h socketbits.h sigaction.h paths.h malloc.h limits.h dlfcn.h
+for ac_hdr in sys/param.h sys/mman.h sys/time.h sys/cdefs.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1661,15 +1661,184 @@ else
fi
done
+for ac_hdr in fnmatch.h sysent.h strings.h sys/stat.h sys/select.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1669: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1674 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in sys/socket.h socketbits.h sigaction.h paths.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1709: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1714 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_hdr in malloc.h limits.h dlfcn.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:1749: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 1754 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+done
+
+
+
+echo $ac_n "checking for jpeg_mem_init in -ljpeg""... $ac_c" 1>&6
+echo "configure:1788: checking for jpeg_mem_init in -ljpeg" >&5
+ac_lib_var=`echo jpeg'_'jpeg_mem_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-ljpeg $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1796 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char jpeg_mem_init();
+
+int main() {
+jpeg_mem_init()
+; return 0; }
+EOF
+if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+ cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+ LIBS="-ljpeg $LIBS"
+
+else
+ echo "$ac_t""no" 1>&6
+fi
+
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1668: checking for working const" >&5
+echo "configure:1837: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1673 "configure"
+#line 1842 "configure"
#include "confdefs.h"
int main() {
@@ -1718,7 +1887,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:1722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1739,21 +1908,21 @@ EOF
fi
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1743: checking for inline" >&5
+echo "configure:1912: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1750 "configure"
+#line 1919 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
@@ -1779,12 +1948,12 @@ EOF
esac
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1783: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1952: checking whether time.h and sys/time.h may both be included" >&5
if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1788 "configure"
+#line 1957 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
@@ -1793,7 +1962,7 @@ int main() {
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:1797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
@@ -1818,12 +1987,12 @@ fi
for ac_func in socket vsnprintf seteuid setegid random strfmon stpcpy mkstemp gettimeofday setenv unsetenv mkstemps
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1822: checking for $ac_func" >&5
+echo "configure:1991: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1827 "configure"
+#line 1996 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1846,7 +2015,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1879,12 +2048,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1883: checking for pid_t" >&5
+echo "configure:2052: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1888 "configure"
+#line 2057 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1913,17 +2082,17 @@ fi
ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:1917: checking for vfork.h" >&5
+echo "configure:2086: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1922 "configure"
+#line 2091 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1948,18 +2117,18 @@ else
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:1952: checking for working vfork" >&5
+echo "configure:2121: checking for working vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
echo $ac_n "checking for vfork""... $ac_c" 1>&6
-echo "configure:1958: checking for vfork" >&5
+echo "configure:2127: checking for vfork" >&5
if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1963 "configure"
+#line 2132 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char vfork(); below. */
@@ -1982,7 +2151,7 @@ vfork();
; return 0; }
EOF
-if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_vfork=yes"
else
@@ -2004,7 +2173,7 @@ fi
ac_cv_func_vfork_works=$ac_cv_func_vfork
else
cat > conftest.$ac_ext <<EOF
-#line 2008 "configure"
+#line 2177 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
@@ -2099,7 +2268,7 @@ main() {
}
}
EOF
-if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
ac_cv_func_vfork_works=yes
else
@@ -2126,17 +2295,17 @@ for ac_hdr in ieeefp.h float.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_hdr" >&5
+echo "configure:2299: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2135 "configure"
+#line 2304 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -2163,7 +2332,7 @@ fi
done
echo $ac_n "checking for isinf in -lm""... $ac_c" 1>&6
-echo "configure:2167: checking for isinf in -lm" >&5
+echo "configure:2336: checking for isinf in -lm" >&5
ac_lib_var=`echo m'_'isinf | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2171,7 +2340,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2175 "configure"
+#line 2344 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2182,7 +2351,7 @@ int main() {
isinf()
; return 0; }
EOF
-if { (eval echo configure:2186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2208,7 +2377,7 @@ else
fi
echo $ac_n "checking for finite in -lm""... $ac_c" 1>&6
-echo "configure:2212: checking for finite in -lm" >&5
+echo "configure:2381: checking for finite in -lm" >&5
ac_lib_var=`echo m'_'finite | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2216,7 +2385,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2220 "configure"
+#line 2389 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2227,7 +2396,7 @@ int main() {
finite()
; return 0; }
EOF
-if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2253,7 +2422,7 @@ else
fi
echo $ac_n "checking for _finite in -lm""... $ac_c" 1>&6
-echo "configure:2257: checking for _finite in -lm" >&5
+echo "configure:2426: checking for _finite in -lm" >&5
ac_lib_var=`echo m'_'_finite | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2261,7 +2430,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2265 "configure"
+#line 2434 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2272,7 +2441,7 @@ int main() {
_finite()
; return 0; }
EOF
-if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2298,7 +2467,7 @@ else
fi
echo $ac_n "checking for isnan in -lm""... $ac_c" 1>&6
-echo "configure:2302: checking for isnan in -lm" >&5
+echo "configure:2471: checking for isnan in -lm" >&5
ac_lib_var=`echo m'_'isnan | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -2306,7 +2475,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2310 "configure"
+#line 2479 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -2317,7 +2486,7 @@ int main() {
isnan()
; return 0; }
EOF
-if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
diff --git a/WebCore/configure.in b/WebCore/configure.in
index 270319a..1f1de54 100644
--- a/WebCore/configure.in
+++ b/WebCore/configure.in
@@ -142,7 +142,18 @@ dnl
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sys/cdefs.h fnmatch.h sysent.h strings.h sys/stat.h sys/select.h sys/socket.h socketbits.h sigaction.h paths.h malloc.h limits.h dlfcn.h)
+AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sys/cdefs.h)
+AC_CHECK_HEADERS(fnmatch.h sysent.h strings.h sys/stat.h sys/select.h)
+AC_CHECK_HEADERS(sys/socket.h socketbits.h sigaction.h paths.h)
+AC_CHECK_HEADERS(malloc.h limits.h dlfcn.h)
+
+dnl
+dnl -------------------------------------------------------------------
+dnl Checks for libraries.
+dnl -------------------------------------------------------------------
+dnl
+
+AC_CHECK_LIB(jpeg,jpeg_mem_init)
dnl
dnl -------------------------------------------------------------------
diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index a766bfb..bb52036 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -26,8 +26,11 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
+#include "qnamespace.h"
#include "qstring.h"
+QRgb qRgb(int r, int g, int b);
+
// class QColor ================================================================
class QColor {
diff --git a/WebCore/kwq/KWQDateTime.h b/WebCore/kwq/KWQDateTime.h
index 90a3b53..bc1eafb 100644
--- a/WebCore/kwq/KWQDateTime.h
+++ b/WebCore/kwq/KWQDateTime.h
@@ -49,6 +49,7 @@ public:
void start();
int msec() const;
int elapsed() const;
+ int restart();
// operators ---------------------------------------------------------------
diff --git a/WebCore/kwq/KWQDef.h b/WebCore/kwq/KWQDef.h
index 93d3830..b4a79cf 100644
--- a/WebCore/kwq/KWQDef.h
+++ b/WebCore/kwq/KWQDef.h
@@ -55,7 +55,9 @@ typedef int WId;
#endif
#define ASSERT(a)
+
void qDebug(const char *msg, ...);
+void qWarning(const char *msg, ...);
#ifdef NEED_BOGUS_X_DEFINES
typedef int XEvent;
diff --git a/WebCore/kwq/KWQImage.h b/WebCore/kwq/KWQImage.h
index b31f9e9..4c349de 100644
--- a/WebCore/kwq/KWQImage.h
+++ b/WebCore/kwq/KWQImage.h
@@ -26,6 +26,9 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
+#include "qnamespace.h"
+#include "qcolor.h"
+
// class QImage ================================================================
class QImage {
@@ -45,13 +48,24 @@ public:
// member functions --------------------------------------------------------
+ bool isNull();
+
+ QRgb color(int) const;
+ void setColor(int, QRgb);
+
int width() const;
int height() const;
int depth() const;
int pixelIndex(int,int) const;
+
+ bool create(int,int,int,int numColors=0);
+
QImage createAlphaMask(int conversion_flags=0) const;
bool hasAlphaBuffer() const;
+ uchar **jumpTable() const;
+ uchar *scanLine(int) const;
+
// operators ---------------------------------------------------------------
QImage &operator=(const QImage &);
diff --git a/WebCore/kwq/KWQNamespace.h b/WebCore/kwq/KWQNamespace.h
index 2935aff..7a5b06d 100644
--- a/WebCore/kwq/KWQNamespace.h
+++ b/WebCore/kwq/KWQNamespace.h
@@ -29,6 +29,8 @@
class QColor;
class QCursor;
+typedef unsigned int QRgb;
+
// class Qt ====================================================================
class Qt {
diff --git a/WebCore/kwq/qt/qasyncimageio.h b/WebCore/kwq/qt/qasyncimageio.h
index 9eb67a0..94d018b 100644
--- a/WebCore/kwq/qt/qasyncimageio.h
+++ b/WebCore/kwq/qt/qasyncimageio.h
@@ -26,8 +26,55 @@
#ifndef QASYNCIMAGEIO_H_
#define QASYNCIMAGEIO_H_
+// for memset
+#include <string.h>
+
#include <KWQDef.h>
+#include "qimage.h"
+#include "qcolor.h"
+#include "qrect.h"
+
+// =============================================================================
+// class QImageConsumer
+
+class QImageConsumer {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static const char* formatName(const uchar* buffer, int length);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImageConsumer();
+
+ ~QImageConsumer();
+
+ // member functions --------------------------------------------------------
+
+ virtual void changed(const QRect &)=0;
+ virtual void end()=0;
+ virtual void setSize(int,int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageConsumer(const QImageConsumer &);
+ QImageConsumer &operator=(const QImageConsumer &);
+
+}; // end class QImageConsumer
+
+// =============================================================================
+
// =============================================================================
// class QImageDecoder
@@ -63,4 +110,72 @@ private:
// =============================================================================
+// =============================================================================
+// class QImageFormat
+
+class QImageFormat {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImageFormat();
+ virtual ~QImageFormat();
+
+ // member functions --------------------------------------------------------
+
+ virtual int decode(QImage &, QImageConsumer *, const uchar *, int) = 0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageFormat(const QImageFormat &);
+ QImageFormat &operator=(const QImageFormat &);
+
+}; // end class QImageFormat
+
+// =============================================================================
+
+// =============================================================================
+// class QImageFormatType
+
+class QImageFormatType {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImageFormatType();
+ virtual ~QImageFormatType();
+
+ // member functions --------------------------------------------------------
+
+ virtual QImageFormat *decoderFor(const uchar *, int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageFormatType(const QImageFormatType &);
+ QImageFormatType &operator=(const QImageFormatType &);
+
+}; // end class QImageFormatType
+
+// =============================================================================
+
#endif
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index a766bfb..bb52036 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -26,8 +26,11 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
+#include "qnamespace.h"
#include "qstring.h"
+QRgb qRgb(int r, int g, int b);
+
// class QColor ================================================================
class QColor {
diff --git a/WebCore/kwq/qt/qdatetime.h b/WebCore/kwq/qt/qdatetime.h
index 90a3b53..bc1eafb 100644
--- a/WebCore/kwq/qt/qdatetime.h
+++ b/WebCore/kwq/qt/qdatetime.h
@@ -49,6 +49,7 @@ public:
void start();
int msec() const;
int elapsed() const;
+ int restart();
// operators ---------------------------------------------------------------
diff --git a/WebCore/kwq/qt/qimage.h b/WebCore/kwq/qt/qimage.h
index b31f9e9..4c349de 100644
--- a/WebCore/kwq/qt/qimage.h
+++ b/WebCore/kwq/qt/qimage.h
@@ -26,6 +26,9 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
+#include "qnamespace.h"
+#include "qcolor.h"
+
// class QImage ================================================================
class QImage {
@@ -45,13 +48,24 @@ public:
// member functions --------------------------------------------------------
+ bool isNull();
+
+ QRgb color(int) const;
+ void setColor(int, QRgb);
+
int width() const;
int height() const;
int depth() const;
int pixelIndex(int,int) const;
+
+ bool create(int,int,int,int numColors=0);
+
QImage createAlphaMask(int conversion_flags=0) const;
bool hasAlphaBuffer() const;
+ uchar **jumpTable() const;
+ uchar *scanLine(int) const;
+
// operators ---------------------------------------------------------------
QImage &operator=(const QImage &);
diff --git a/WebCore/kwq/qt/qnamespace.h b/WebCore/kwq/qt/qnamespace.h
index 2935aff..7a5b06d 100644
--- a/WebCore/kwq/qt/qnamespace.h
+++ b/WebCore/kwq/qt/qnamespace.h
@@ -29,6 +29,8 @@
class QColor;
class QCursor;
+typedef unsigned int QRgb;
+
// class Qt ====================================================================
class Qt {
diff --git a/WebCore/src/kwq/KWQDef.h b/WebCore/src/kwq/KWQDef.h
index 93d3830..b4a79cf 100644
--- a/WebCore/src/kwq/KWQDef.h
+++ b/WebCore/src/kwq/KWQDef.h
@@ -55,7 +55,9 @@ typedef int WId;
#endif
#define ASSERT(a)
+
void qDebug(const char *msg, ...);
+void qWarning(const char *msg, ...);
#ifdef NEED_BOGUS_X_DEFINES
typedef int XEvent;
diff --git a/WebCore/src/kwq/qt/qasyncimageio.h b/WebCore/src/kwq/qt/qasyncimageio.h
index 9eb67a0..94d018b 100644
--- a/WebCore/src/kwq/qt/qasyncimageio.h
+++ b/WebCore/src/kwq/qt/qasyncimageio.h
@@ -26,8 +26,55 @@
#ifndef QASYNCIMAGEIO_H_
#define QASYNCIMAGEIO_H_
+// for memset
+#include <string.h>
+
#include <KWQDef.h>
+#include "qimage.h"
+#include "qcolor.h"
+#include "qrect.h"
+
+// =============================================================================
+// class QImageConsumer
+
+class QImageConsumer {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+
+ // static member functions -------------------------------------------------
+
+ static const char* formatName(const uchar* buffer, int length);
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImageConsumer();
+
+ ~QImageConsumer();
+
+ // member functions --------------------------------------------------------
+
+ virtual void changed(const QRect &)=0;
+ virtual void end()=0;
+ virtual void setSize(int,int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageConsumer(const QImageConsumer &);
+ QImageConsumer &operator=(const QImageConsumer &);
+
+}; // end class QImageConsumer
+
+// =============================================================================
+
// =============================================================================
// class QImageDecoder
@@ -63,4 +110,72 @@ private:
// =============================================================================
+// =============================================================================
+// class QImageFormat
+
+class QImageFormat {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImageFormat();
+ virtual ~QImageFormat();
+
+ // member functions --------------------------------------------------------
+
+ virtual int decode(QImage &, QImageConsumer *, const uchar *, int) = 0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageFormat(const QImageFormat &);
+ QImageFormat &operator=(const QImageFormat &);
+
+}; // end class QImageFormat
+
+// =============================================================================
+
+// =============================================================================
+// class QImageFormatType
+
+class QImageFormatType {
+public:
+
+ // typedefs ----------------------------------------------------------------
+ // enums -------------------------------------------------------------------
+ // constants ---------------------------------------------------------------
+ // static member functions -------------------------------------------------
+
+ // constructors, copy constructors, and destructors ------------------------
+
+ QImageFormatType();
+ virtual ~QImageFormatType();
+
+ // member functions --------------------------------------------------------
+
+ virtual QImageFormat *decoderFor(const uchar *, int)=0;
+
+ // operators ---------------------------------------------------------------
+
+// protected -------------------------------------------------------------------
+// private ---------------------------------------------------------------------
+
+private:
+ // no copying or assignment
+ QImageFormatType(const QImageFormatType &);
+ QImageFormatType &operator=(const QImageFormatType &);
+
+}; // end class QImageFormatType
+
+// =============================================================================
+
#endif
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index a766bfb..bb52036 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -26,8 +26,11 @@
#ifndef QCOLOR_H_
#define QCOLOR_H_
+#include "qnamespace.h"
#include "qstring.h"
+QRgb qRgb(int r, int g, int b);
+
// class QColor ================================================================
class QColor {
diff --git a/WebCore/src/kwq/qt/qdatetime.h b/WebCore/src/kwq/qt/qdatetime.h
index 90a3b53..bc1eafb 100644
--- a/WebCore/src/kwq/qt/qdatetime.h
+++ b/WebCore/src/kwq/qt/qdatetime.h
@@ -49,6 +49,7 @@ public:
void start();
int msec() const;
int elapsed() const;
+ int restart();
// operators ---------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/qimage.h b/WebCore/src/kwq/qt/qimage.h
index b31f9e9..4c349de 100644
--- a/WebCore/src/kwq/qt/qimage.h
+++ b/WebCore/src/kwq/qt/qimage.h
@@ -26,6 +26,9 @@
#ifndef QIMAGE_H_
#define QIMAGE_H_
+#include "qnamespace.h"
+#include "qcolor.h"
+
// class QImage ================================================================
class QImage {
@@ -45,13 +48,24 @@ public:
// member functions --------------------------------------------------------
+ bool isNull();
+
+ QRgb color(int) const;
+ void setColor(int, QRgb);
+
int width() const;
int height() const;
int depth() const;
int pixelIndex(int,int) const;
+
+ bool create(int,int,int,int numColors=0);
+
QImage createAlphaMask(int conversion_flags=0) const;
bool hasAlphaBuffer() const;
+ uchar **jumpTable() const;
+ uchar *scanLine(int) const;
+
// operators ---------------------------------------------------------------
QImage &operator=(const QImage &);
diff --git a/WebCore/src/kwq/qt/qnamespace.h b/WebCore/src/kwq/qt/qnamespace.h
index 2935aff..7a5b06d 100644
--- a/WebCore/src/kwq/qt/qnamespace.h
+++ b/WebCore/src/kwq/qt/qnamespace.h
@@ -29,6 +29,8 @@
class QColor;
class QCursor;
+typedef unsigned int QRgb;
+
// class Qt ====================================================================
class Qt {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list