This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 64e401961449cfeaa72e3c8c5a4489da5abbabfd (commit)
via 2eaac2a5d77246788ed9002444d369cfb44da39d (commit)
via f1a36b4c07abd97860e3a07cc9b9f3c82df8243b (commit)
via ebe7673bf62ed8465b5d60e670280f6b01782a79 (commit)
via 8e0ec489a80e341319e4dfc78874ec1f3deba40e (commit)
via 698cffacc5c3900ac6c6e5d4b0716235ac9b6d67 (commit)
via 9a0c3ab737d737d9b2a8f50f1bcc7b370203bfa2 (commit)
via f17ec34ccea4108825769b78169b2f72cfae99fe (commit)
via 79bad0d14c44c88df31cf6fd5ed5b3934eab0387 (commit)
via c3139e9d0c99f32773e4328bfb0bb822e8a077a7 (commit)
from 177fb22126f7ce8fa00d18aca971168c11a724e8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/64e401961449cfeaa72e3c8c5a4489da5abbabfd
commit 64e401961449cfeaa72e3c8c5a4489da5abbabfd
Author: David Maciejak <david.macie...@gmail.com>
Date: Thu May 8 20:16:06 2014 +0200
wmaker: minor improvements to labels in the info panel
The goal is to make them shorter/more correct
diff --git a/src/dialog.c b/src/dialog.c
index 541bd748..da126ae5 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1280,7 +1280,7 @@ void wShowInfoPanel(WScreen *scr)
}
#endif
- strbuf = wstrappend(strbuf, _("Supported image formats: "));
+ strbuf = wstrappend(strbuf, _("Image formats: "));
strl = RSupportedFileFormats();
separator = NULL;
for (i = 0; strl[i] != NULL; i++) {
@@ -1309,7 +1309,7 @@ void wShowInfoPanel(WScreen *scr)
strbuf = wstrappend(strbuf, _("Xinerama: "));
{
char tmp[128];
- snprintf(tmp, sizeof(tmp) - 1, _("%d heads found."),
scr->xine_info.count);
+ snprintf(tmp, sizeof(tmp) - 1, _("%d head(s) found."),
scr->xine_info.count);
strbuf = wstrappend(strbuf, tmp);
}
#endif
http://repo.or.cz/w/wmaker-crm.git/commit/2eaac2a5d77246788ed9002444d369cfb44da39d
commit 2eaac2a5d77246788ed9002444d369cfb44da39d
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:16:05 2014 +0200
wrlib: add detection for ImageMagick using pkg-config
We rely on pkg-config first, because that is the traditional way to
query configs and because that's how the MagickWand API suggests to do.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index 7411b953..cad2d727 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -262,43 +262,49 @@ AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK],
[AC_REQUIRE([_WM_LIB_CHECK_FUNCTS])
AS_IF([test "x$enable_magick" = "xno"],
[unsupported="$unsupported Magick"],
- [AC_CHECK_PROG([MAGICKWCONFIG], [MagickWand-config], [MagickWand-config])
- AS_IF([test "x$MAGICKWCONFIG" = "x"],
- [AS_IF([test "x$enable_magick" = "xyes"],
- [AC_MSG_ERROR([explicit Magick support requested but
MagickWand-config not found])])
- enable_magick=no
- unsupported="$unsupported Magick"],
- [AC_CACHE_CHECK([for Magick support library], [wm_cv_libchk_magick],
- [wm_cv_libchk_magick=no
- wm_cv_libchk_magick_cflags=`$MAGICKWCONFIG --cflags`
- wm_cv_libchk_magick_libs=`$MAGICKWCONFIG --ldflags`
+ [AC_CACHE_CHECK([for Magick support library], [wm_cv_libchk_magick],
+ [wm_cv_libchk_magick=no
+ dnl First try to get the configuration from either pkg-config (the
official way)
+ dnl or with the fallback MagickWand-config
+ AS_IF([test "x$PKGCONFIG" = "x"],
+ [AC_PATH_PROGS_FEATURE_CHECK([magickwand], [MagickWand-config],
+ [wm_cv_libchk_magick_cflags=`$ac_path_magickwand --cflags`
+ wm_cv_libchk_magick_libs=`$ac_path_magickwand --ldflags`
+ wm_cv_libchk_magick=magickwand])],
+ [AS_IF([$PKGCONFIG --exists MagickWand],
+ [wm_cv_libchk_magick_cflags=`$PKGCONFIG --cflags MagickWand`
+ wm_cv_libchk_magick_libs=`$PKGCONFIG --libs MagickWand`
+ wm_cv_libchk_magick=pkgconfig])])
+ AS_IF([test "x$wm_cv_libchk_magick" = "xno"],
+ [AS_IF([test "x$enable_magick" != "xauto"],
+ [AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([explicit Magick support requested but
configuration not found with pkg-config and MagickWand-config - are you missing
libmagickwand-dev package?])])],
+ [dnl The configuration was found, check that it actually works
wm_save_LIBS="$LIBS"
dnl
dnl We check that the library is available
AS_IF([wm_fn_lib_try_link "NewMagickWand"
"$wm_cv_libchk_magick_libs"],
[wm_cv_libchk_magick=maybe])
LIBS="$wm_save_LIBS"
- AS_IF([test "x$enable_magick$wm_cv_libchk_magick" = "xyesno"],
- [AC_MSG_ERROR([explicit Magick support requested but library
does not link])])
+ AS_IF([test "x$wm_cv_libchk_magick" != "xmaybe"],
+ [AC_MSG_ERROR([MagickWand was found but the library does not
link])])
dnl
dnl The library was found, check if header is available and
compiles
- AS_IF([test "x$wm_cv_libchk_magick" != "xno"],
- [wm_save_CFLAGS="$CFLAGS"
- AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h"
"MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
- [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags %
$wm_cv_libchk_magick_libs"],
- [AC_MSG_ERROR([found Magick library but could not
compile appropriate header - are you missing libmagickwand-dev package?])])
- CFLAGS="$wm_save_CFLAGS"])
- ])
- AS_IF([test "x$wm_cv_libchk_magick" = "xno"],
- [unsupported="$unsupported Magick"
- enable_magick="no"],
- [supported_gfx="$supported_gfx Magick"
- MAGICKFLAGS=`echo "$wm_cv_libchk_magick" | sed -e 's, *%.*$,,' `
- MAGICKLIBS=`echo "$wm_cv_libchk_magick" | sed -e 's,^.*% *,,' `
- AC_DEFINE([USE_MAGICK], [1],
- [defined when MagickWand library with header was found])])
- ])dnl AS_IF(MAGICKWCONFIG != "")
- ])
+ wm_save_CFLAGS="$CFLAGS"
+ AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "MagickWand
*wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
+ [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags %
$wm_cv_libchk_magick_libs"],
+ [AC_MSG_ERROR([found MagickWand library but could not
compile its header])])
+ CFLAGS="$wm_save_CFLAGS"])dnl
+ ])
+ AS_IF([test "x$wm_cv_libchk_magick" = "xno"],
+ [unsupported="$unsupported Magick"
+ enable_magick="no"],
+ [supported_gfx="$supported_gfx Magick"
+ MAGICKFLAGS=`echo "$wm_cv_libchk_magick" | sed -e 's, *%.*$,,' `
+ MAGICKLIBS=`echo "$wm_cv_libchk_magick" | sed -e 's,^.*% *,,' `
+ AC_DEFINE([USE_MAGICK], [1],
+ [defined when MagickWand library with header was found])])
+ ])
AM_CONDITIONAL([USE_MAGICK], [test "x$enable_magick" != "xno"])dnl
AC_SUBST(MAGICKFLAGS)dnl
AC_SUBST(MAGICKLIBS)dnl
http://repo.or.cz/w/wmaker-crm.git/commit/f1a36b4c07abd97860e3a07cc9b9f3c82df8243b
commit f1a36b4c07abd97860e3a07cc9b9f3c82df8243b
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:16:04 2014 +0200
wrlib: do not initialize/release ImageMagick unnecessarily
Instead of calling 'MagickWandGenesis' every time an image is loaded, only
call it the first time, and similarly do not call 'MagickWandTerminus' if
the library has not been used before.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
index e8201b98..622276f8 100644
--- a/wrlib/load_magick.c
+++ b/wrlib/load_magick.c
@@ -28,6 +28,9 @@
#include "imgformat.h"
+static int RInitMagickIfNeeded(void);
+
+
RImage *RLoadMagick(const char *file_name)
{
RImage *image = NULL;
@@ -38,7 +41,10 @@ RImage *RLoadMagick(const char *file_name)
MagickBooleanType hasAlfa;
PixelWand *bg_wand = NULL;
- MagickWandGenesis();
+ if (RInitMagickIfNeeded()) {
+ RErrorCode = RERR_BADFORMAT;
+ return NULL;
+ }
/* Create a wand */
m_wand = NewMagickWand();
@@ -87,7 +93,31 @@ bye:
return image;
}
+/* Track the state of the library in memory */
+static enum {
+ MW_NotReady,
+ MW_Ready
+} magick_state;
+
+/*
+ * Initialise MagickWand, but only if it was not already done
+ *
+ * Return ok(0) when MagickWand is usable and fail(!0) if not usable
+ */
+static int RInitMagickIfNeeded(void)
+{
+ if (magick_state == MW_NotReady) {
+ MagickWandGenesis();
+ magick_state = MW_Ready;
+ }
+
+ return 0;
+}
+
void RReleaseMagick(void)
{
- MagickWandTerminus();
+ if (magick_state == MW_Ready) {
+ MagickWandTerminus();
+ magick_state = MW_NotReady;
+ }
}
http://repo.or.cz/w/wmaker-crm.git/commit/ebe7673bf62ed8465b5d60e670280f6b01782a79
commit ebe7673bf62ed8465b5d60e670280f6b01782a79
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:16:03 2014 +0200
wrlib: moved 'RShutdown' from 'load.c' to 'misc.c' for consistency
The cleanup function is actually not specific to loading images and could
do a lot more, so it is probably better placed in 'misc.c'
diff --git a/wrlib/imgformat.h b/wrlib/imgformat.h
index 0d3b9d42..004da308 100644
--- a/wrlib/imgformat.h
+++ b/wrlib/imgformat.h
@@ -75,6 +75,8 @@ RImage *RLoadWEBP(const char *file);
#ifdef USE_MAGICK
RImage *RLoadMagick(const char *file_name);
+
+void RReleaseMagick(void);
#endif
/*
diff --git a/wrlib/load.c b/wrlib/load.c
index df0ae9ff..44750708 100644
--- a/wrlib/load.c
+++ b/wrlib/load.c
@@ -103,13 +103,6 @@ char **RSupportedFileFormats(void)
return tmp;
}
-/* cleaning third-party libs at shutdown */
-void RShutdown() {
-#ifdef USE_MAGICK
- MagickWandTerminus();
-#endif
-}
-
static void init_cache(void)
{
char *tmp;
diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
index 009c554f..e8201b98 100644
--- a/wrlib/load_magick.c
+++ b/wrlib/load_magick.c
@@ -86,3 +86,8 @@ bye:
return image;
}
+
+void RReleaseMagick(void)
+{
+ MagickWandTerminus();
+}
diff --git a/wrlib/misc.c b/wrlib/misc.c
index 4a7c0657..00a7c576 100644
--- a/wrlib/misc.c
+++ b/wrlib/misc.c
@@ -26,6 +26,8 @@
#include <X11/Xlib.h>
#include "wraster.h"
+#include "imgformat.h"
+
void RBevelImage(RImage * image, int bevel_type)
{
@@ -240,3 +242,13 @@ const char *RMessageForError(int errorCode)
return "internal error";
}
}
+
+/*
+ * cleaning third-party libs at shutdown
+ */
+void RShutdown(void)
+{
+#ifdef USE_MAGICK
+ RReleaseMagick();
+#endif
+}
http://repo.or.cz/w/wmaker-crm.git/commit/8e0ec489a80e341319e4dfc78874ec1f3deba40e
commit 8e0ec489a80e341319e4dfc78874ec1f3deba40e
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:16:02 2014 +0200
wrlib: changed the function used to detecting MagickWand
It looks like that the function 'MagickGetImagePixels' is part of
the "deprecate.h" header, at least in ImageMagick 6.8.8. As it is not
used in WRaster's code, it is safer to actually check for 'NewMagickWand'
that is being used and which is not yet deprecated.
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index 8e003bfb..7411b953 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -275,7 +275,7 @@ AS_IF([test "x$enable_magick" = "xno"],
wm_save_LIBS="$LIBS"
dnl
dnl We check that the library is available
- AS_IF([wm_fn_lib_try_link "MagickGetImagePixels"
"$wm_cv_libchk_magick_libs"],
+ AS_IF([wm_fn_lib_try_link "NewMagickWand"
"$wm_cv_libchk_magick_libs"],
[wm_cv_libchk_magick=maybe])
LIBS="$wm_save_LIBS"
AS_IF([test "x$enable_magick$wm_cv_libchk_magick" = "xyesno"],
@@ -284,7 +284,7 @@ AS_IF([test "x$enable_magick" = "xno"],
dnl The library was found, check if header is available and
compiles
AS_IF([test "x$wm_cv_libchk_magick" != "xno"],
[wm_save_CFLAGS="$CFLAGS"
- AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" ""
"return 0" "$wm_cv_libchk_magick_cflags"],
+ AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h"
"MagickWand *wand;" "wand = NewMagickWand()" "$wm_cv_libchk_magick_cflags"],
[wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags %
$wm_cv_libchk_magick_libs"],
[AC_MSG_ERROR([found Magick library but could not
compile appropriate header - are you missing libmagickwand-dev package?])])
CFLAGS="$wm_save_CFLAGS"])
http://repo.or.cz/w/wmaker-crm.git/commit/698cffacc5c3900ac6c6e5d4b0716235ac9b6d67
commit 698cffacc5c3900ac6c6e5d4b0716235ac9b6d67
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:16:01 2014 +0200
wrlib: grouped the detection of ImageMagick in the CHECK_MAGICK macro
Took the opportunity to expand the WM_LIB_CHECK macro because it is not
suited for the case where compilation flags can be queried but was meant
for the case when they have to be guessed
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/configure.ac b/configure.ac
index f077da53..6b9bca23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,11 +322,6 @@ dnl ==========
dnl AC_ARG_VAR(PKGCONFIG, [pkg-config command])
AC_CHECK_PROG(PKGCONFIG, pkg-config, pkg-config)
-dnl MagickWand-config
-dnl ==========
-dnl AC_ARG_VAR(MAGICKWCONFIG, [MagickWand-config command])
-AC_CHECK_PROG(MAGICKWCONFIG, MagickWand-config, MagickWand-config)
-
dnl gettext
dnl =======
@@ -564,26 +559,6 @@ else
fi
AC_SUBST(FCLIBS)
-dnl
-dnl libMagickWand
-dnl
-AC_MSG_CHECKING([for libmagickwand header])
-MAGICKFLAGS=`$MAGICKWCONFIG --cflags`
-if test "x$MAGICKFLAGS" = "x" ; then
- AC_MSG_RESULT([not found])
-else
- AC_MSG_RESULT([found])
-fi
-AC_SUBST(MAGICKFLAGS)
-
-AC_MSG_CHECKING([for libmagickwand library])
-MAGICKLIBS=`$MAGICKWCONFIG --ldflags`
-if test "x$MAGICKLIBS" = "x" ; then
- AC_MSG_RESULT([not found])
-else
- AC_MSG_RESULT([found])
-fi
-AC_SUBST(MAGICKLIBS)
dnl Xft2 antialiased font support
dnl =============================
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index 2bf9e744..8e003bfb 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -259,11 +259,47 @@ AM_CONDITIONAL([USE_XPM], [test "x$enable_xpm" !=
"xno"])dnl
# and MAGICKLIBS, and append info to the variable 'supported_gfx'
# When not found, append info to variable 'unsupported'
AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK],
-[WM_LIB_CHECK([MAGICK], ["$MAGICKLIBS"], [MagickGetImagePixels], [$XLFLAGS
$XLIBS],
- [wm_save_CFLAGS="$CFLAGS $MAGICKLIBS"
- AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" ""],
- [],
- [AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header
- are you missing libmagickwand package?])])
- CFLAGS="$wm_save_CFLAGS"],
- [supported_gfx], [GFXLIBS])dnl
+[AC_REQUIRE([_WM_LIB_CHECK_FUNCTS])
+AS_IF([test "x$enable_magick" = "xno"],
+ [unsupported="$unsupported Magick"],
+ [AC_CHECK_PROG([MAGICKWCONFIG], [MagickWand-config], [MagickWand-config])
+ AS_IF([test "x$MAGICKWCONFIG" = "x"],
+ [AS_IF([test "x$enable_magick" = "xyes"],
+ [AC_MSG_ERROR([explicit Magick support requested but
MagickWand-config not found])])
+ enable_magick=no
+ unsupported="$unsupported Magick"],
+ [AC_CACHE_CHECK([for Magick support library], [wm_cv_libchk_magick],
+ [wm_cv_libchk_magick=no
+ wm_cv_libchk_magick_cflags=`$MAGICKWCONFIG --cflags`
+ wm_cv_libchk_magick_libs=`$MAGICKWCONFIG --ldflags`
+ wm_save_LIBS="$LIBS"
+ dnl
+ dnl We check that the library is available
+ AS_IF([wm_fn_lib_try_link "MagickGetImagePixels"
"$wm_cv_libchk_magick_libs"],
+ [wm_cv_libchk_magick=maybe])
+ LIBS="$wm_save_LIBS"
+ AS_IF([test "x$enable_magick$wm_cv_libchk_magick" = "xyesno"],
+ [AC_MSG_ERROR([explicit Magick support requested but library
does not link])])
+ dnl
+ dnl The library was found, check if header is available and
compiles
+ AS_IF([test "x$wm_cv_libchk_magick" != "xno"],
+ [wm_save_CFLAGS="$CFLAGS"
+ AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" ""
"return 0" "$wm_cv_libchk_magick_cflags"],
+ [wm_cv_libchk_magick="$wm_cv_libchk_magick_cflags %
$wm_cv_libchk_magick_libs"],
+ [AC_MSG_ERROR([found Magick library but could not
compile appropriate header - are you missing libmagickwand-dev package?])])
+ CFLAGS="$wm_save_CFLAGS"])
+ ])
+ AS_IF([test "x$wm_cv_libchk_magick" = "xno"],
+ [unsupported="$unsupported Magick"
+ enable_magick="no"],
+ [supported_gfx="$supported_gfx Magick"
+ MAGICKFLAGS=`echo "$wm_cv_libchk_magick" | sed -e 's, *%.*$,,' `
+ MAGICKLIBS=`echo "$wm_cv_libchk_magick" | sed -e 's,^.*% *,,' `
+ AC_DEFINE([USE_MAGICK], [1],
+ [defined when MagickWand library with header was found])])
+ ])dnl AS_IF(MAGICKWCONFIG != "")
+ ])
+AM_CONDITIONAL([USE_MAGICK], [test "x$enable_magick" != "xno"])dnl
+AC_SUBST(MAGICKFLAGS)dnl
+AC_SUBST(MAGICKLIBS)dnl
]) dnl AC_DEFUN
http://repo.or.cz/w/wmaker-crm.git/commit/9a0c3ab737d737d9b2a8f50f1bcc7b370203bfa2
commit 9a0c3ab737d737d9b2a8f50f1bcc7b370203bfa2
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:16:00 2014 +0200
wrlib: light changes to the code for ImageMagick
- changed header used for MagickWand to the one specified in the online
documentation
- changed a comparison to 'MagickTrue' because its value does not allow a
compiler optimisation that would be expected in present case
- fixed potential crash, if loading with Magick fails it could return a
pointer to a de-allocated area
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
index 397ed34d..009c554f 100644
--- a/wrlib/load_magick.c
+++ b/wrlib/load_magick.c
@@ -21,9 +21,8 @@
*/
#include "config.h"
-#include <X11/Xlib.h>
-#include <wand/magick_wand.h>
+#include <wand/MagickWand.h>
#include "wraster.h"
#include "imgformat.h"
@@ -67,14 +66,15 @@ RImage *RLoadMagick(const char *file_name)
}
ptr = image->data;
- if (hasAlfa == MagickTrue)
- mrc = MagickExportImagePixels(m_wand, 0, 0, (size_t)w,
(size_t)h, "RGBA", CharPixel, ptr);
- else
+ if (hasAlfa == MagickFalse)
mrc = MagickExportImagePixels(m_wand, 0, 0, (size_t)w,
(size_t)h, "RGB", CharPixel, ptr);
+ else
+ mrc = MagickExportImagePixels(m_wand, 0, 0, (size_t)w,
(size_t)h, "RGBA", CharPixel, ptr);
if (mrc == MagickFalse) {
RErrorCode = RERR_BADIMAGEFILE;
RReleaseImage(image);
+ image = NULL;
goto bye;
}
http://repo.or.cz/w/wmaker-crm.git/commit/f17ec34ccea4108825769b78169b2f72cfae99fe
commit f17ec34ccea4108825769b78169b2f72cfae99fe
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:15:59 2014 +0200
wrlib: fixed compilation to use the flags detected by configure for
MagickWand
Signed-off-by: Christophe CURIS <christophe.cu...@free.fr>
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index daf4a1ff..d88ecc6c 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -68,9 +68,10 @@ if USE_MAGICK
libwraster_la_SOURCES += load_magick.c
endif
+AM_CFLAGS = @MAGICKFLAGS@
AM_CPPFLAGS = $(DFLAGS) @HEADER_SEARCH_PATH@
-libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ @LIBXMU@ -lm
+libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @MAGICKLIBS@ @XLIBS@
@LIBXMU@ -lm
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = wrlib.pc
@@ -83,7 +84,7 @@ wrlib.pc: Makefile
@echo 'Description: Image manipulation and conversion library' >> $@
@echo 'Version: $(VERSION)' >> $@
@echo 'Libs: $(lib_search_path) -lwraster' >> $@
- @echo 'Libs.private: $(GFXLIBS) $(XLIBS) -lm' >> $@
+ @echo 'Libs.private: $(GFXLIBS) $(MAGICKLIBS) $(XLIBS) -lm' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@
get-wraster-flags: get-wraster-flags.in Makefile
http://repo.or.cz/w/wmaker-crm.git/commit/79bad0d14c44c88df31cf6fd5ed5b3934eab0387
commit 79bad0d14c44c88df31cf6fd5ed5b3934eab0387
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:15:58 2014 +0200
wrlib: renamed compilation flags variables with a name less prone to clash
diff --git a/configure.ac b/configure.ac
index 3d42c610..f077da53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,22 +568,22 @@ dnl
dnl libMagickWand
dnl
AC_MSG_CHECKING([for libmagickwand header])
-IMFLAGS=`$MAGICKWCONFIG --cflags`
-if test "x$IMFLAGS" = "x" ; then
+MAGICKFLAGS=`$MAGICKWCONFIG --cflags`
+if test "x$MAGICKFLAGS" = "x" ; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([found])
fi
-AC_SUBST(IMFLAGS)
+AC_SUBST(MAGICKFLAGS)
AC_MSG_CHECKING([for libmagickwand library])
-IMLIBS=`$MAGICKWCONFIG --ldflags`
-if test "x$IMLIBS" = "x" ; then
+MAGICKLIBS=`$MAGICKWCONFIG --ldflags`
+if test "x$MAGICKLIBS" = "x" ; then
AC_MSG_RESULT([not found])
else
AC_MSG_RESULT([found])
fi
-AC_SUBST(IMLIBS)
+AC_SUBST(MAGICKLIBS)
dnl Xft2 antialiased font support
dnl =============================
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index af43f717..2bf9e744 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -259,8 +259,8 @@ AM_CONDITIONAL([USE_XPM], [test "x$enable_xpm" != "xno"])dnl
# and MAGICKLIBS, and append info to the variable 'supported_gfx'
# When not found, append info to variable 'unsupported'
AC_DEFUN_ONCE([WM_IMGFMT_CHECK_MAGICK],
-[WM_LIB_CHECK([MAGICK], ["$IMLIBS"], [MagickGetImagePixels], [$XLFLAGS $XLIBS],
- [wm_save_CFLAGS="$CFLAGS $IMFLAGS"
+[WM_LIB_CHECK([MAGICK], ["$MAGICKLIBS"], [MagickGetImagePixels], [$XLFLAGS
$XLIBS],
+ [wm_save_CFLAGS="$CFLAGS $MAGICKLIBS"
AS_IF([wm_fn_lib_try_compile "wand/magick_wand.h" "" "return 0" ""],
[],
[AC_MSG_ERROR([found $CACHEVAR but could not find appropriate header
- are you missing libmagickwand package?])])
http://repo.or.cz/w/wmaker-crm.git/commit/c3139e9d0c99f32773e4328bfb0bb822e8a077a7
commit c3139e9d0c99f32773e4328bfb0bb822e8a077a7
Author: Christophe CURIS <christophe.cu...@free.fr>
Date: Thu May 8 20:15:57 2014 +0200
wrlib: fixed prototype for 'RShutdown' in the public API header
Took opportunity to move it closer to the beginning of the file to improve
its visibility to users of the lib
diff --git a/wrlib/wraster.h b/wrlib/wraster.h
index c4ed2310..88f3a72a 100644
--- a/wrlib/wraster.h
+++ b/wrlib/wraster.h
@@ -290,6 +290,11 @@ enum {
/*
+ * Cleaning before application exit
+ */
+void RShutdown(void);
+
+/*
* Returns a NULL terminated array of strings containing the
* supported formats, such as: TIFF, XPM, PNG, JPEG, PPM, GIF
* Do not free the returned data.
@@ -431,11 +436,7 @@ RImage *RRenderMultiGradient(unsigned width, unsigned
height, RColor **colors,
RImage *RRenderInterwovenGradient(unsigned width, unsigned height,
RColor colors1[2], int thickness1,
RColor colors2[2], int thickness2);
-/*
- * Cleaning
- */
-void RShutdown();
/*
* Convertion into X Pixmaps
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 25 ---------------------
m4/wm_imgfmt_check.m4 | 56 ++++++++++++++++++++++++++++++++++++++++++------
src/dialog.c | 4 +-
wrlib/Makefile.am | 5 ++-
wrlib/imgformat.h | 2 +
wrlib/load.c | 7 ------
wrlib/load_magick.c | 47 +++++++++++++++++++++++++++++++++++-----
wrlib/misc.c | 12 ++++++++++
wrlib/wraster.h | 9 ++++---
9 files changed, 114 insertions(+), 53 deletions(-)
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
