From fad87cef81ecc02e7a1d9814d5e79fa3201b1fa7 Mon Sep 17 00:00:00 2001 From: kramm Date: Sat, 6 Feb 2010 19:19:50 -0800 Subject: [PATCH] fixed win32 compilation, added missing files to tarball --- configure | 24 ++++++++++++------------ configure.in | 4 ++-- lib/gfxpoly/active.c | 6 ++++++ lib/pdf/Makefile.in | 2 ++ lib/xml.c | 2 +- release.in | 34 +++++++++++++++++++++++++++++++++- 6 files changed, 56 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 4ca0258..4f67cc7 100755 --- a/configure +++ b/configure @@ -1892,7 +1892,7 @@ fi PACKAGE=swftools -VERSION=2009-08-12-1514 +VERSION=2010-02-06-1900 # ------------------------------------------------------------------ @@ -4608,9 +4608,9 @@ fi fi -{ $as_echo "$as_me:$LINENO: checking for zzip_dir_fdopen in -lzzip" >&5 -$as_echo_n "checking for zzip_dir_fdopen in -lzzip... " >&6; } -if test "${ac_cv_lib_zzip_zzip_dir_fdopen+set}" = set; then +{ $as_echo "$as_me:$LINENO: checking for zzip_file_open in -lzzip" >&5 +$as_echo_n "checking for zzip_file_open in -lzzip... " >&6; } +if test "${ac_cv_lib_zzip_zzip_file_open+set}" = set; then $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4628,11 +4628,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char zzip_dir_fdopen (); +char zzip_file_open (); int main () { -return zzip_dir_fdopen (); +return zzip_file_open (); ; return 0; } @@ -4658,12 +4658,12 @@ $as_echo "$ac_try_echo") >&5 test "$cross_compiling" = yes || $as_test_x conftest$ac_exeext }; then - ac_cv_lib_zzip_zzip_dir_fdopen=yes + ac_cv_lib_zzip_zzip_file_open=yes else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_zzip_zzip_dir_fdopen=no + ac_cv_lib_zzip_zzip_file_open=no fi rm -rf conftest.dSYM @@ -4671,9 +4671,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_zzip_zzip_dir_fdopen" >&5 -$as_echo "$ac_cv_lib_zzip_zzip_dir_fdopen" >&6; } -if test "x$ac_cv_lib_zzip_zzip_dir_fdopen" = x""yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_zzip_zzip_file_open" >&5 +$as_echo "$ac_cv_lib_zzip_zzip_file_open" >&6; } +if test "x$ac_cv_lib_zzip_zzip_file_open" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBZZIP 1 _ACEOF @@ -10258,7 +10258,7 @@ fi if test -f "release.in"; then release_in="./release"; fi if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi -FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile" +FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/readers/Makefile" ac_config_files="$ac_config_files ${FILES}" cat >confcache <<\_ACEOF diff --git a/configure.in b/configure.in index a9351f0..732e2ce 100644 --- a/configure.in +++ b/configure.in @@ -34,7 +34,7 @@ if test "x$enable_lame" = "xno";then fi,DISABLE_LAME=) PACKAGE=swftools -VERSION=2009-08-12-1514 +VERSION=2010-02-06-1900 # ------------------------------------------------------------------ @@ -571,7 +571,7 @@ AH_BOTTOM([ if test -f "release.in"; then release_in="./release"; fi if test -f "Makefile.new.in"; then mk_in="./Makefile.new"; fi -FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/art/Makefile lib/readers/Makefile" +FILES="$release_in $mk_in Makefile.common ${avi2swf} Makefile lib/Makefile lib/action/Makefile src/Makefile ${pdf2swf_makefile} swfs/Makefile ${pythonrfxswf} ${lame_makefile} lib/readers/Makefile" AC_OUTPUT(${FILES}) dnl new autoconf diff --git a/lib/gfxpoly/active.c b/lib/gfxpoly/active.c index 2904e08..b723185 100644 --- a/lib/gfxpoly/active.c +++ b/lib/gfxpoly/active.c @@ -1,7 +1,9 @@ #include #include #include +#include "../../config.h" #include "../q.h" +#include "../types.h" #include "active.h" actlist_t* actlist_new() @@ -503,7 +505,11 @@ void actlist_delete(actlist_t*a, segment_t*s) } else if(!a->root->rightchild) { a->root = a->root->leftchild; } else { +#ifdef HAVE_LRAND48 if(lrand48()&1) { +#else + if(((ptroff_t)s)&16) { +#endif // free up root->left->right segment_t*t = a->root->leftchild; while(t->rightchild) { diff --git a/lib/pdf/Makefile.in b/lib/pdf/Makefile.in index d4b37a8..1c093c7 100644 --- a/lib/pdf/Makefile.in +++ b/lib/pdf/Makefile.in @@ -53,9 +53,11 @@ pdf.$(O): pdf.cc GFXOutputDev.h InfoOutputDev.h CommonOutputDev.h BitmapOutputDe $(CC) -I ./ -I xpdf pdf.cc -o $@ XPDFOK = xpdf/Gfx.cc +ifeq ($(shell echo inject*xpdf.pl),inject-xpdf.pl) $(XPDFOK): Makefile.in inject-xpdf.pl xpdf-*tar.gz xpdf*patch @if test xpdf-changes.patch -nt $(XPDFOK);then perl inject-xpdf.pl xpdf-3.02.tar.gz;fi @if test '!' -d xpdf;then perl inject-xpdf.pl xpdf-3.02.tar.gz;fi +endif xpdf/UnicodeMap.$(O): xpdf/UnicodeMap.cc $(CC) -I ./ -I xpdf xpdf/UnicodeMap.cc -o $@ diff --git a/lib/xml.c b/lib/xml.c index ef26388..ff65c9e 100644 --- a/lib/xml.c +++ b/lib/xml.c @@ -221,7 +221,7 @@ int xml_parse(reader_t*reader, xmlconsumer_t*out) /* inner loop */ do { - state = new_state[old=state][group[buffer[pos++]]]; + state = new_state[old=state][group[(unsigned char)buffer[pos++]]]; } while(state>=0); switch(state) { diff --git a/release.in b/release.in index c75256b..eacce3a 100644 --- a/release.in +++ b/release.in @@ -100,9 +100,12 @@ ${name}/lib/jpeg.c \ ${name}/lib/drawer.c \ ${name}/lib/drawer.h \ ${name}/lib/mem.c \ -${name}/lib/mem.h +${name}/lib/mem.h \ +${name}/lib/graphcut.c \ +${name}/lib/graphcut.h \ ${name}/lib/modules/swffilter.c \ ${name}/lib/modules/swfrender.c \ +${name}/lib/modules/swfalignzones.c \ ${name}/lib/readers/swf.c \ ${name}/lib/readers/swf.h \ ${name}/lib/readers/image.c \ @@ -149,8 +152,12 @@ ${name}/lib/mp3.c \ ${name}/lib/wav.c \ ${name}/lib/wav.h \ ${name}/lib/mp3.h \ +${name}/lib/xml.h \ +${name}/lib/xml.c \ ${name}/lib/modules/swfdraw.c \ ${name}/lib/modules/swfaction.c \ +${name}/lib/as3/assets.c \ +${name}/lib/as3/assets.h \ ${name}/lib/as3/code.c \ ${name}/lib/as3/code.h \ ${name}/lib/as3/import.c \ @@ -210,12 +217,31 @@ ${name}/lib/log.c \ ${name}/lib/log.h \ ${name}/lib/os.c \ ${name}/lib/os.h \ +${name}/lib/gfximage.c \ +${name}/lib/gfximage.h \ ${name}/lib/gfxdevice.h \ ${name}/lib/gfxsource.h \ ${name}/lib/gfxtools.h \ ${name}/lib/gfxpoly.h \ ${name}/lib/gfxtools.c \ ${name}/lib/gfxpoly.c \ +${name}/lib/gfxpoly/active.c \ +${name}/lib/gfxpoly/active.h \ +${name}/lib/gfxpoly/convert.c \ +${name}/lib/gfxpoly/convert.h \ +${name}/lib/gfxpoly/poly.c \ +${name}/lib/gfxpoly/poly.h \ +${name}/lib/gfxpoly/renderpoly.c \ +${name}/lib/gfxpoly/renderpoly.h \ +${name}/lib/gfxpoly/stroke.c \ +${name}/lib/gfxpoly/stroke.h \ +${name}/lib/gfxpoly/wind.c \ +${name}/lib/gfxpoly/wind.h \ +${name}/lib/gfxpoly/xrow.c \ +${name}/lib/gfxpoly/xrow.h \ +${name}/lib/gfxpoly/heap.h \ +${name}/lib/pdf/bbox.c \ +${name}/lib/pdf/bbox.h \ ${name}/lib/devices/ocr.h \ ${name}/lib/devices/ocr.c \ ${name}/lib/devices/swf.h \ @@ -250,6 +276,8 @@ ${name}/lib/pdf/BitmapOutputDev.cc \ ${name}/lib/pdf/FullBitmapOutputDev.cc \ ${name}/lib/pdf/InfoOutputDev.h \ ${name}/lib/pdf/InfoOutputDev.cc \ +${name}/lib/pdf/XMLOutputDev.h \ +${name}/lib/pdf/XMLOutputDev.cc \ ${name}/lib/pdf/CommonOutputDev.h \ ${name}/lib/pdf/fonts.c \ ${name}/lib/pdf/fonts.h \ @@ -306,6 +334,8 @@ ${name}/lib/pdf/xpdf/Link.h \ ${name}/lib/pdf/xpdf/NameToCharCode.cc \ ${name}/lib/pdf/xpdf/NameToCharCode.h \ ${name}/lib/pdf/xpdf/NameToUnicodeTable.h \ +${name}/lib/pdf/xpdf/UnicodeTypeTable.cc \ +${name}/lib/pdf/xpdf/UnicodeTypeTable.h \ ${name}/lib/pdf/xpdf/Object.cc \ ${name}/lib/pdf/xpdf/Object.h \ ${name}/lib/pdf/xpdf/OutputDev.cc \ @@ -380,6 +410,8 @@ ${name}/lib/pdf/xpdf/SplashGlyphBitmap.h \ ${name}/lib/pdf/xpdf/SplashMath.h \ ${name}/lib/pdf/xpdf/SplashOutputDev.cc \ ${name}/lib/pdf/xpdf/SplashOutputDev.h \ +${name}/lib/pdf/xpdf/TextOutputDev.cc \ +${name}/lib/pdf/xpdf/TextOutputDev.h \ ${name}/lib/pdf/xpdf/SplashPath.cc \ ${name}/lib/pdf/xpdf/SplashPath.h \ ${name}/lib/pdf/xpdf/SplashPattern.cc \ -- 1.7.10.4