Imported Upstream version 1.7.5

diff --git a/ChangeLog b/ChangeLog
index 653f744..c12fce2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1142,3 +1142,13 @@
 
        * 1.7.4 release
 
+2013-01-02  Carsten Haitzler (The Rasterman)
+
+        * Fixed evas_software_xlib_x_write_mask_line() issue - it was
+        finding a segment in the shm cache of the wrong size for masks!
+
+2013-01-04  Luis Felipe Strano Moraes
+
+       * 1.7.5 release
+
+

diff --git a/NEWS b/NEWS
index d6f0c64..703f815 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
-Evas 1.7.4
+Evas 1.7.5
+
+Changes since Evas 1.7.4:
+-------------------------
+
+   * Fix mask write lines to not choose too small segments
 
 Changes since Evas 1.7.3:
 -------------------------
@@ -15,10 +20,7 @@ Fixes:
    * Fix Evas RGBA_Image->flags.loaded for copied images. 
    * Fix evas_object_image_is_inside()
    * Fix small memory leak in evas_bidi_utils error path
-
     
-Evas 1.7.3
-
 Changes since Evas 1.7.2
 -------------------------
 

diff --git a/configure b/configure
index 058cae4..9cb75dd 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for evas 1.7.4.
+# Generated by GNU Autoconf 2.68 for evas 1.7.5.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='evas'
 PACKAGE_TARNAME='evas'
-PACKAGE_VERSION='1.7.4'
-PACKAGE_STRING='evas 1.7.4'
+PACKAGE_VERSION='1.7.5'
+PACKAGE_STRING='evas 1.7.5'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1808,7 +1808,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures evas 1.7.4 to adapt to many kinds of systems.
+\`configure' configures evas 1.7.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1882,7 +1882,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of evas 1.7.4:";;
+     short | recursive ) echo "Configuration of evas 1.7.5:";;
    esac
   cat <<\_ACEOF
 
@@ -2253,7 +2253,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-evas configure 1.7.4
+evas configure 1.7.5
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3105,7 +3105,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by evas $as_me 1.7.4, which was
+It was created by evas $as_me 1.7.5, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3929,7 +3929,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='evas'
- VERSION='1.7.4'
+ VERSION='1.7.5'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12963,7 +12963,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 4
+#define VMIC 5
 _ACEOF
 
 
@@ -12971,7 +12971,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:4:7"
+version_info="8:5:7"
 release_info=""
 
 
@@ -12990,7 +12990,7 @@ case "$host_os" in
       MODULE_ARCH="$host_os-$host_cpu"
       ;;
    *)
-      MODULE_ARCH="$host_os-$host_cpu-1.7.4"
+      MODULE_ARCH="$host_os-$host_cpu-1.7.5"
       ;;
 esac
 
@@ -18895,7 +18895,7 @@ $as_echo_n "checking size of FriBidiChar... " >&6; }
 if ${ac_cv_sizeof_FriBidiChar+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (FriBidiChar))" "ac_cv_sizeof_FriBidiChar"        "#include <fribidi/fribidi.h>
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (FriBidiChar))" "ac_cv_sizeof_FriBidiChar"        "#include <fribidi.h>
 "; then :
 
 else
@@ -34325,7 +34325,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by evas $as_me 1.7.4, which was
+This file was extended by evas $as_me 1.7.5, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -34391,7 +34391,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-evas config.status 1.7.4
+evas config.status 1.7.5
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 7d3dd8c..c429ba3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [4])
+m4_define([v_mic], [5])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
@@ -350,7 +350,7 @@ if test "x${want_fribidi}" = "xyes" -o "x${want_fribidi}" = "xauto" ; then
        requirement_evas="fribidi ${requirement_evas}"
        CPPFLAGS_SAVE="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $FRIBIDI_CFLAGS"
-       AC_CHECK_SIZEOF(FriBidiChar,, [#include <fribidi/fribidi.h>])
+       AC_CHECK_SIZEOF(FriBidiChar,, [#include <fribidi.h>])
        CPPFLAGS="$CPPFLAGS_SAVE"
       ],
       [

diff --git a/evas.spec b/evas.spec
index 71fa727..3b10162 100644 (file)
--- a/evas.spec
+++ b/evas.spec
@@ -85,7 +85,7 @@
 
 Summary: Multi-platform Canvas Library
 Name: evas
-Version: 1.7.4
+Version: 1.7.5
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries

diff --git a/src/lib/Evas.h b/src/lib/Evas.h
index 47557a1..d48018b 100644 (file)
--- a/src/lib/Evas.h
+++ b/src/lib/Evas.h
@@ -1,8 +1,8 @@
 /**
    @mainpage Evas
 
-   @version 1.7
-   @date 2000-2012
+   @version 1.7.5
+   @date 2000-2013
 
    Please see the @ref authors page for contact details.
    @link Evas.h Evas API @endlink

diff --git a/src/modules/engines/software_x11/evas_xcb_outbuf.c b/src/modules/engines/software_x11/evas_xcb_outbuf.c
index 042248d..6bf5481 100644 (file)
--- a/src/modules/engines/software_x11/evas_xcb_outbuf.c
+++ b/src/modules/engines/software_x11/evas_xcb_outbuf.c
@@ -1115,13 +1115,14 @@ _find_xcbob(xcb_connection_t *conn, xcb_visualtype_t *vis, int depth, int w, int
      return evas_software_xcb_output_buffer_new(conn, vis, depth, w, h, 
                                                 shm, data);
 
-   lbytes = (((w + 63) / 64) * 4);
    if (depth > 1) 
      {
         bpp = (depth / 8);
         if (bpp == 3) bpp = 4;
         lbytes = ((((w * bpp) + 3) / 4) * 4);
      }
+   else
+     lbytes = (((w + 63) / 64) * 8);
 
    sz = (lbytes * h);
    SHMPOOL_LOCK();

diff --git a/src/modules/engines/software_x11/evas_xlib_outbuf.c b/src/modules/engines/software_x11/evas_xlib_outbuf.c
index 9bbdd73..e337e99 100644 (file)
--- a/src/modules/engines/software_x11/evas_xlib_outbuf.c
+++ b/src/modules/engines/software_x11/evas_xlib_outbuf.c
@@ -53,7 +53,7 @@ _find_xob(Display *d, Visual *v, int depth, int w, int h, int shm, void *data)
        lbytes = (((w * bpp) + 3) / 4) * 4;
      }
    else
-     lbytes = ((w + 63) / 64) * 4;
+     lbytes = ((w + 63) / 64) * 8;
    sz = lbytes * h;
    SHMPOOL_LOCK();
    EINA_LIST_FOREACH(shmpool, l, xob2)