From: Matthias Kramm <kramm@quiss.org>
Date: Sun, 6 Jun 2010 00:18:41 +0000 (-0700)
Subject: Merge branch 'horizontals'
X-Git-Tag: version-0-9-1~5
X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=commitdiff_plain;h=a9634f803811f39e67114955c3e9c30ae247a669

Merge branch 'horizontals'

Conflicts:
	lib/gfxpoly/Makefile
	lib/gfxpoly/poly.h
---

a9634f803811f39e67114955c3e9c30ae247a669
diff --cc config.h.in
index 7f99da5,7f99da5..9f122a0
--- a/config.h.in
+++ b/config.h.in
@@@ -282,4 -282,4 +282,13 @@@
  #define calloc rfx_calloc_replacement
  #endif
  
++//#ifdef HAVE_BUILTIN_EXPECT
++#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
++# define likely(x)      __builtin_expect((x), 1)
++# define unlikely(x)    __builtin_expect((x), 0)
++#else
++# define likely(x)      (x)
++# define unlikely(x)    (x)
++#endif
++
  #endif
diff --cc lib/gfxpoly/Makefile
index 542839c,ccf252c..6faca66
--- a/lib/gfxpoly/Makefile
+++ b/lib/gfxpoly/Makefile
@@@ -16,28 -16,28 +16,28 @@@ testheap: ../libbase.a testheap.
  SRC = active.c convert.c poly.c wind.c renderpoly.c xrow.c stroke.c
  OBJS = active.o convert.o poly.o wind.o renderpoly.o xrow.o stroke.o
  
- active.o: active.c active.h poly.h
+ active.o: active.c active.h poly.h Makefile
  	$(CC) -c active.c -o active.o
  
- convert.o: convert.c convert.h poly.h
+ convert.o: convert.c convert.h poly.h Makefile
  	$(CC) -c convert.c -o convert.o
  
- poly.o: poly.c poly.h active.h heap.h ../q.h
+ poly.o: poly.c poly.h active.h heap.h ../q.h Makefile
  	$(CC) -c poly.c -o poly.o
  
- wind.o: wind.c wind.h poly.h
+ wind.o: wind.c wind.h poly.h Makefile
  	$(CC) -c wind.c -o wind.o
  
- renderpoly.o: renderpoly.c wind.h poly.h renderpoly.h
+ renderpoly.o: renderpoly.c wind.h poly.h renderpoly.h Makefile
  	$(CC) -c renderpoly.c -o renderpoly.o
  
- xrow.o: xrow.c xrow.h ../q.h ../mem.h
+ xrow.o: xrow.c xrow.h ../q.h ../mem.h Makefile
  	$(CC) -c xrow.c -o xrow.o
  
- stroke.o: stroke.c poly.h convert.h wind.h
+ stroke.o: stroke.c poly.h convert.h wind.h Makefile
  	$(CC) -c stroke.c -o stroke.o
  
 -GFX=../gfxfont.o ../gfxtools.o ../gfximage.o  ../devices/ops.o ../devices/polyops.o ../devices/text.o ../devices/bbox.o ../devices/render.o ../devices/rescale.o ../devices/record.o
 +GFX=../gfxfont.o ../gfxtools.o ../gfximage.o ../devices/ops.o ../devices/polyops.o ../devices/text.o ../devices/bbox.o ../devices/render.o ../devices/rescale.o ../devices/record.o
  stroke: test_stroke.c $(OBJS) ../libgfxswf.a ../librfxswf.a ../libbase.a 
  	$(CC) test_stroke.c $(OBJS) ../libgfxswf.a ../librfxswf.a $(GFX) ../libbase.a -o stroke $(LIBS)
  
diff --cc wx/Makefile
index 9a690d2,3ed15ef..e5cde64
--- a/wx/Makefile
+++ b/wx/Makefile
@@@ -15,5 -14,5 +15,6 @@@ pdf2swf_gui.exe: gpdf2swf.py gui/*.py v
  	#ln -f gpdf2swf.exe ../win32_gui/
  	ln -f gpdf2swf.exe ../win32/
  	cp -R viewers/* ../win32/viewers/
++	rm -rf ../win32/viewers/flexpaper* # we're not distributing flexpaper
  
  .PHONY: exe
diff --cc wx/gui/dialogs.py
index b5387c1,b5387c1..906afd4
--- a/wx/gui/dialogs.py
+++ b/wx/gui/dialogs.py
@@@ -113,7 -113,7 +113,7 @@@ class InfoDialog(wx.Dialog)
  class AboutDialog:
      def __init__(self, parent):
          appname = wx.GetApp().GetAppName()
--        version = u"0.9.0"
++        version = u"0.10.0"
          copyright = (u"Copyright (c) 2008,2009,2010\n"
                       u"Matthias Kramm <kramm@quiss.org>")
          description = u"A graphical user interface for pdf2swf"