[Gnash-commit] /srv/bzr/gnash/trunk r9795: Use libungif if libgif isn't found. Minor tweaks in matrix_test.swf.

[Sandro Santilli]

------------------------------------------------------------
revno: 9795
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Sat 2008-09-20 08:37:02 +0200
message:
  Use libungif if libgif isn't found. Minor tweaks in matrix_test.swf.
modified:
  configure.ac
  testsuite/misc-ming.all/matrix_test.c
    ------------------------------------------------------------
    revno: 9794.1.1
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Fri 2008-09-19 22:01:29 +0200
    message:
      try libungif if libgif wasn't found (bug #24168)
    modified:
      configure.ac
    ------------------------------------------------------------
    revno: 9794.1.2
    committer: Sandro Santilli <address@hidden>
    branch nick: mybranch
    timestamp: Sat 2008-09-20 08:36:21 +0200
    message:
      minor rounding to make the test succeed on win
    modified:
      testsuite/misc-ming.all/matrix_test.c

=== modified file 'configure.ac'
--- a/configure.ac      2008-09-18 01:34:20 +0000
+++ b/configure.ac      2008-09-19 20:01:29 +0000
@@ -1534,6 +1534,11 @@
 GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
 GNASH_PKG_FIND(libpng, [png.h], [png images], png_info_init)
 GNASH_PKG_FIND(gif, [gif_lib.h], [gif images], DGifOpen)
+if test x"${GIF_LIBS}" = x ; then
+ GNASH_PKG_FIND(ungif, [gif_lib.h], [gif images], DGifOpen)
+ GIF_LIBS=${UNGIF_LIBS}
+ GIF_CFLAGS=${UNGIF_CFLAGS}
+fi
 GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
 
 dnl Find freetype and fontconfig

=== modified file 'testsuite/misc-ming.all/matrix_test.c'
--- a/testsuite/misc-ming.all/matrix_test.c     2008-09-19 14:24:29 +0000
+++ b/testsuite/misc-ming.all/matrix_test.c     2008-09-20 06:36:21 +0000
@@ -875,7 +875,7 @@
     // NOTE: might change if this is a Ming bug
     xcheck_equals(mo, "staticmc.transform.matrix.toString()", "'(a=1, 
b=0.972518920898438, c=-1, d=1, tx=13.95, ty=214.8)'");
 
-       check_equals(mo, "staticmc._x", "13.950");
+       check_equals(mo, "Math.round(staticmc._x*100)/100", "13.95"); 
        check_equals(mo, "staticmc._y", "214.80");
        check_equals(mo, "Math.round(staticmc._xscale)", "139");
        check_equals(mo, "Math.round(staticmc._yscale)", "141");
@@ -1693,7 +1693,7 @@
     // Ming omits the scales rather then set them to zero (ops)
     // NOTE: might change if this is a Ming bug
     xcheck_equals(mo, "printMatrix(staticmc.transform.matrix, 2)", "'(a=1, 
b=0.97, c=-1, d=1, tx=13.95, ty=214.8)'");
-       check_equals(mo, "staticmc._x", "13.950");
+       check_equals(mo, "Math.round(staticmc._x*100)/100", "13.95"); 
        check_equals(mo, "staticmc._y", "214.80");
        check_equals(mo, "Math.round(staticmc._xscale)", "139");
        check_equals(mo, "Math.round(staticmc._yscale)", "141");
@@ -1701,7 +1701,7 @@
        check_equals(mo, "printBounds(staticmc.getBounds(_root), 0)", "'-46,156 
74,274'");
        add_actions(mo, "staticmc._xscale = 0 - staticmc._xscale;"); // swap 
_xscale sign using ActionScript
     xcheck_equals(mo, "printMatrix(staticmc.transform.matrix, 2)", "'(a=-1, 
b=-0.97, c=-1, d=1, tx=13.95, ty=214.8)'");
-       check_equals(mo, "staticmc._x", "13.950");
+       check_equals(mo, "Math.round(staticmc._x*100)/100", "13.95"); 
        check_equals(mo, "staticmc._y", "214.80");
        check_equals(mo, "Math.round(staticmc._xscale)", "-139");
        check_equals(mo, "Math.round(staticmc._yscale)", "141");