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
discards 3e85cf242ac7bcd516f5ba9bf5854562db458daa (commit)
discards 4e55a370bbd085cd73b0bc8ed0e2a169acdb4bfe (commit)
discards dcfa3fb48e309abcdfdccbea9bb883b7aa5a88e5 (commit)
discards 47dc56c302d6c65471defd16f0a67e2159484894 (commit)
via 9ad35c440f73e2cbaf074ed2ad8d94f464a3d19e (commit)
via bcc85e51c60284b8818bdc786870ca82d02c465f (commit)
via f2201f45cfe097da1dc281804e7dc8a78c6c8f64 (commit)
via ed072cd57872ff28e2d506b3ae42819faba84a1c (commit)
via 058e0a0ebdebe6a1f30ac4c9ab7d9b5ace686250 (commit)
via bb69682b88bdb9d4abaf32bf9f5b2f9fb80c2c23 (commit)
via b6ffe90ec4b53122446c9b1ada9e82677e9bfdde (commit)
via 36159c614f67e7481d86159434cd6a6b273f23b5 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (3e85cf242ac7bcd516f5ba9bf5854562db458daa)
N -- N -- N (9ad35c440f73e2cbaf074ed2ad8d94f464a3d19e)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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/9ad35c440f73e2cbaf074ed2ad8d94f464a3d19e
commit 9ad35c440f73e2cbaf074ed2ad8d94f464a3d19e
Author: Christophe CURIS <[email protected]>
Date: Thu Apr 10 23:52:08 2014 +0200
wmaker: Updated Armenian translation against changes in Info Panel
Only the 'msgid' was updated, to make sure gettext can still find
the old translation, but I am not fluent in Armenian and google
translate is not helpful here, so I can't do better for the
translated string.
diff --git a/po/hy.po b/po/hy.po
index 56427d49..762eb7de 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -476,8 +476,8 @@ msgstr "(%d գույն)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Ընդհանուր հատկացված հիշողությունը՝ %i կբ. Ընդհանուր օգտագործվող
հիշողությունը՝ %i կբ.n"
-#: ../src/dialog.c:1361
-msgid "Supported image formats: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
msgstr "Կիրառելի պատկերային որմատները"
#: ../src/dialog.c:1368
http://repo.or.cz/w/wmaker-crm.git/commit/bcc85e51c60284b8818bdc786870ca82d02c465f
commit bcc85e51c60284b8818bdc786870ca82d02c465f
Author: Christophe CURIS <[email protected]>
Date: Sat Apr 26 11:35:33 2014 +0200
wmaker: Updated Dutch translation against changes in Info Panel
Only the 'msgid' was updated, to make sure gettext can still find
the old translation, but I am not fluent in Dutch so I can't do
better for the translated string.
diff --git a/po/nl.po b/po/nl.po
index fa0103be..b93c5a9a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -392,7 +392,7 @@ msgid "Total memory allocated: %i kB (in use: %i kB).n"
msgstr "Toegewezen geheugen: %i kB (gebruikt: %i kB).n"
#: ../src/dialog.c:1282
-msgid "Supported image formats: "
+msgid "Image formats: "
msgstr "Ondersteunde afb.: "
#: ../src/dialog.c:1292
http://repo.or.cz/w/wmaker-crm.git/commit/f2201f45cfe097da1dc281804e7dc8a78c6c8f64
commit f2201f45cfe097da1dc281804e7dc8a78c6c8f64
Author: Christophe CURIS <[email protected]>
Date: Sun Apr 27 15:34:07 2014 +0200
wmaker: update translations following string changes from previous commit
The 'msgid' were updated to ensure gettext will find them, and the
translation have been updated too to stay in line with the message
(within the limits of google translate's help, because I don't speak all
these languages).
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/po/be.po b/po/be.po
index 803d51e2..ea74e56c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -373,9 +373,9 @@ msgstr "(%d колераў)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Зарэзервавана памяці: %i кБ. Выкарыстоўваецца: %i кБ.n"
-#: ../src/dialog.c:1432
-msgid "Supported image formats: "
-msgstr "Падтрымліваемыя графічныя фарматы: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Графічныя фарматы: "
#: ../src/dialog.c:1439
msgid ""
diff --git a/po/bg.po b/po/bg.po
index 7994f370..dd01bc3e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -498,9 +498,9 @@ msgstr "(%d цвята)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Заделена памет: %i KB. Употребявана памет: %i KB.n"
-#: ../src/dialog.c:1432
-msgid "Supported image formats: "
-msgstr "Поддържани графични формати: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Графични формати: "
#: ../src/dialog.c:1439
msgid ""
diff --git a/po/ca.po b/po/ca.po
index 4c375bfa..71e0cfdb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -388,9 +388,9 @@ msgstr "(%d colors)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Memòria assignada total: %i KB. Memòria en ús: %i KB.n"
-#: ../src/dialog.c:1358
-msgid "Supported image formats: "
-msgstr "Formats d'imatge suportats: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Formats d'imatge: "
#: ../src/dialog.c:1365
msgid ""
diff --git a/po/cs.po b/po/cs.po
index 3c0c5e31..0e41b97c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -379,9 +379,9 @@ msgstr "(%d barev)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Přidělená paměť: %i kB. Používaná paměť: %i kB.n"
-#: ../src/dialog.c:1325
-msgid "Supported image formats: "
-msgstr "Podporované formáty obrázků: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Formáty obrázků: "
#: ../src/dialog.c:1332
msgid ""
diff --git a/po/da.po b/po/da.po
index 98a73a2a..154d674a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -459,9 +459,9 @@ msgstr "(%d farver)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Total tildelt hukommelse: %i kB. Total hukommelse i brug: %i kB.n"
-#: ../src/dialog.c:1408
-msgid "Supported image formats: "
-msgstr "Understøttede billedformater: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Billedformater: "
#: ../src/dialog.c:1415
msgid ""
diff --git a/po/de.po b/po/de.po
index 59ea1eb5..ec5ed3d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -403,9 +403,9 @@ msgid "Total allocated memory: %i kB. Total memory in use:
%i kB.n"
msgstr ""
"Gesamter belegter Speicher: %i kB. Gesamter benutzter Speicher: %i kB.n"
-#: ../src/dialog.c:1248
-msgid "Supported image formats: "
-msgstr "Unterstütze Grafikformate: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Grafikformate: "
#: ../src/dialog.c:1255
msgid ""
diff --git a/po/es.po b/po/es.po
index 47924625..88fabc13 100644
--- a/po/es.po
+++ b/po/es.po
@@ -409,9 +409,9 @@ msgstr "(%d colores)n"
msgid "Total memory allocated: %i kB (in use: %i kB).n"
msgstr "Memoria total disponible: %i kB (en uso: %i kB).n"
-#: ../src/dialog.c:1240
-msgid "Supported image formats: "
-msgstr "Formatos de imagen soportados: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Formatos de imagen: "
#: ../src/dialog.c:1247
#, c-format
diff --git a/po/et.po b/po/et.po
index 070c5358..54857e3d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -408,9 +408,9 @@ msgstr "(%d värvi)n"
msgid "Total memory allocated: %i kB (in use: %i kB).n"
msgstr "Kogu eraldatud mälu: %i kB (kasutusel: %i kB).n"
-#: ../src/dialog.c:1238
-msgid "Supported image formats: "
-msgstr "Toetatud pildivormingud: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Pildivormingud: "
#: ../src/dialog.c:1245
msgid ""
diff --git a/po/fi.po b/po/fi.po
index 563be3ad..88e2f808 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -371,9 +371,9 @@ msgstr "(%d väriä)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Muistia varattu yhteensä %i kt. Muistia käytössä yhteensä %i kt.n"
-#: ../src/dialog.c:1327
-msgid "Supported image formats: "
-msgstr "Tuetut kuvamuodot: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Kuvamuodot: "
#: ../src/dialog.c:1334
msgid ""
diff --git a/po/fr.po b/po/fr.po
index ac51dff1..8e4cd84e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -378,9 +378,9 @@ msgstr "(%d couleurs)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Mémoire allouée : %i ko. Mémoire utilisée : %i ko.n"
-#: ../src/dialog.c:1358
-msgid "Supported image formats: "
-msgstr "Formats d'images acceptés : "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Formats d'images : "
#: ../src/dialog.c:1365
msgid ""
diff --git a/po/hu.po b/po/hu.po
index 95dabf0f..a07cca6d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -404,9 +404,9 @@ msgstr "Lefoglalt memória: %i kB (használatban: %i kB, %d
szabad darab)n"
msgid "Total memory allocated: %i kB (in use: %i kB).n"
msgstr "Lefoglalt memória: %i kB (használatban: %i kB)n"
-#: ../../wmaker-crm/src/dialog.c:1282
-msgid "Supported image formats: "
-msgstr "Kép formátum támogatás: "
+#: ../../wmaker-crm/src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Kép formátum: "
#: ../../wmaker-crm/src/dialog.c:1292
msgid ""
@@ -434,9 +434,9 @@ msgstr "Solaris "
msgid "Xinerama: "
msgstr "Xinerama: "
-#: ../../wmaker-crm/src/dialog.c:1315
+#: ../../wmaker-crm/src/dialog.c:1320
#, c-format
-msgid "%d heads found."
+msgid "%d head(s) found."
msgstr "%d képernyőt találtam."
#: ../../wmaker-crm/src/dialog.c:1342
diff --git a/po/it.po b/po/it.po
index 16db4356..af128a31 100644
--- a/po/it.po
+++ b/po/it.po
@@ -412,9 +412,9 @@ msgstr "(%d colori)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Memoria allocata: %i kB. Memoria utilizzata: %i kB.n"
-#: ../src/dialog.c:1360
-msgid "Supported image formats: "
-msgstr "Formati di immagine supportati: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Formati di immagine: "
#: ../src/dialog.c:1367
msgid ""
diff --git a/po/ja.po b/po/ja.po
index 6dc5a558..887e67bf 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -396,9 +396,9 @@ msgstr "(%d 色)n"
msgid "Total memory allocated: %i kB (in use: %i kB).n"
msgstr "割当メモリ: %i kB. 使用中メモリ: %i kB.n"
-#: ../src/dialog.c:1240
-msgid "Supported image formats: "
-msgstr "対応画像形式: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "画像形式: "
#: ../src/dialog.c:1247
msgid ""
diff --git a/po/ko.po b/po/ko.po
index d1130245..c8e1d333 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -394,9 +394,9 @@ msgstr "사용된 전체 메모리: %i kB (사용중: %i kB, %d 사용가능).n
msgid "Total memory allocated: %i kB (in use: %i kB).n"
msgstr "사용된 전체 메모리: %i kB (사용중: %i kB).n"
-#: ../src/dialog.c:1269
-msgid "Supported image formats: "
-msgstr "지원되는 이미지 형식:"
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "이미지 형식:"
#: ../src/dialog.c:1279
msgid ""
@@ -426,9 +426,9 @@ msgstr "솔라리스"
msgid "Xinerama: "
msgstr ""
-#: ../src/dialog.c:1302
+#: ../src/dialog.c:1320
#, c-format
-msgid "%d heads found."
+msgid "%d head(s) found."
msgstr ""
#: ../src/dialog.c:1331
diff --git a/po/ms.po b/po/ms.po
index 51a9e412..8a465be6 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -371,9 +371,9 @@ msgstr "(%d warna)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Jumlam memori diperuntukkan: %i kB. Jumlah memori digunakan: %i kB.n"
-#: ../src/dialog.c:1406
-msgid "Supported image formats: "
-msgstr "Format imej yang disokong: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Format imej: "
#: ../src/dialog.c:1413
msgid ""
diff --git a/po/nl.po b/po/nl.po
index f6a4b076..fa0103be 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -425,7 +425,7 @@ msgstr "Xinerama: "
#: ../src/dialog.c:1315
#, c-format
-msgid "%d heads found."
+msgid "%d head(s) found."
msgstr "%d koppen gevonden."
#: ../src/dialog.c:1342
diff --git a/po/ru.po b/po/ru.po
index 6261b1eb..cd88c86c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -401,8 +401,8 @@ msgid "Total allocated memory: %i kB. Total memory in use:
%i kB.n"
msgstr ""
# intentionally left untranslated
-#: ../src/dialog.c:1432
-msgid "Supported image formats: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
msgstr ""
# intentionally left untranslated
diff --git a/po/sk.po b/po/sk.po
index 394d7aa6..53d25d48 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -393,9 +393,9 @@ msgstr "(%d farby)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "Alokovaná pamäť spolu: %i kB. Využívaná pamäť spolu: %i kB.n"
-#: ../src/dialog.c:1358
-msgid "Supported image formats: "
-msgstr "Podpora grafických formátov: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "Grafických formátov: "
#: ../src/dialog.c:1365
msgid ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 02271a09..fbe45793 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -407,9 +407,9 @@ msgstr "(%d 色)n"
msgid "Total allocated memory: %i kB. Total memory in use: %i kB.n"
msgstr "已配置記憶體總計: %i kB。使用中憶體總計: %i kB。n"
-#: ../src/dialog.c:1360
-msgid "Supported image formats: "
-msgstr "支援影像格式: "
+#: ../src/dialog.c:1283
+msgid "Image formats: "
+msgstr "影像格式: "
#: ../src/dialog.c:1367
msgid ""
http://repo.or.cz/w/wmaker-crm.git/commit/ed072cd57872ff28e2d506b3ae42819faba84a1c
commit ed072cd57872ff28e2d506b3ae42819faba84a1c
Author: Christophe CURIS <[email protected]>
Date: Tue Apr 29 01:06:03 2014 +0200
wrlib: revert addition of an internal ImgFormat for ImageMagick
IM_MAGICK is not a file format, and in the current implementation it is
a special case for handling IM_UNKNOWN.
diff --git a/wrlib/imgformat.h b/wrlib/imgformat.h
index f60c9659..0d3b9d42 100644
--- a/wrlib/imgformat.h
+++ b/wrlib/imgformat.h
@@ -39,13 +39,12 @@ typedef enum {
IM_PPM = 4,
IM_JPEG = 5,
IM_GIF = 6,
- IM_WEBP = 7,
- IM_MAGICK = 8
+ IM_WEBP = 7
} WRImgFormat;
/* How many image types we have. */
/* Increase this when adding new image types! */
-#define IM_TYPES 8
+#define IM_TYPES 7
/*
* Function for Loading in a specific format
http://repo.or.cz/w/wmaker-crm.git/commit/058e0a0ebdebe6a1f30ac4c9ab7d9b5ace686250
commit 058e0a0ebdebe6a1f30ac4c9ab7d9b5ace686250
Author: Doug Torrance <[email protected]>
Date: Sun Apr 27 16:40:55 2014 -0500
Added pkg-config file for WUtil.
Currently, there is no WUtil.pc file so that WINGs developers can use
pkg-config to compile programs using the WINGs utility library. This patch
fixes this, and such a file is created by make, just like WINGs.pc and
wrlib.pc.
In addition, the WUtil.pc file has been added to .gitignore and included in
the debian libwings-dev package.
diff --git a/.gitignore b/.gitignore
index 77fee965..2dc28602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,6 +81,7 @@ WPrefs.app/WPrefs
# These files are generated from make rules
wrlib/wrlib.pc
WINGs/WINGs.pc
+WINGs/WUtil.pc
WindowMaker/Defaults/WMRootMenu
WindowMaker/Defaults/WMState
diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 3dac104a..e70988de 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -94,7 +94,7 @@ AM_CPPFLAGS = -DLOCALEDIR="$(NLSDIR)"
-DRESOURCE_PATH="$(datadir)/WINGs" @XFTFLAGS@ @HEADER_SEARCH_PATH@
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = WINGs.pc
+pkgconfig_DATA = WINGs.pc WUtil.pc
DISTCLEANFILES = $(pkgconfig_DATA) get-wings-flags get-wutil-flags
@@ -103,7 +103,7 @@ WINGs.pc: Makefile
@echo 'Name: WINGs' > $@
@echo 'Description: Small widget set with the NeXTStep(TM) look and
feel' >> $@
@echo 'Version: $(VERSION)' >> $@
- @echo 'Requires: wrlib' >> $@
+ @echo 'Requires: wrlib WUtil' >> $@
@echo 'Libs: $(lib_search_path) -lWINGs' >> $@
@echo 'Libs.private: $(XFTLIBS) $(XLIBS) -lm $(INTLIBS)' >> $@
@echo 'Cflags: $(inc_search_path)' >> $@
@@ -118,6 +118,15 @@ get-wings-flags: get-wings-flags.in Makefile
-e 's#$${XLIBS}#$(XLIBS)#;' < $(abs_srcdir)/get-wings-flags.in
> $@
@chmod 755 $@
+WUtil.pc: Makefile
+ @echo "Generating $@"
+ @echo 'Name: WUtil' > $@
+ @echo 'Description: Utility library for WINGs' >> $@
+ @echo 'Version: $(VERSION)' >> $@
+ @echo 'Libs: -L$(libdir) -lWUtil' >> $@
+ @echo 'Libs.private: $(INTLIBS)' >> $@
+ @echo 'Cflags: -I$(includedir)' >> $@
+
get-wutil-flags: get-wutil-flags.in Makefile
@echo "Generating $@"
@$(SED) -e 's#$${includedir}#$(includedir)#;' diff --git
a/debian/libwings-dev.install b/debian/libwings-dev.install
index 475aa096..62f00166 100644
--- a/debian/libwings-dev.install
+++ b/debian/libwings-dev.install
@@ -2,6 +2,7 @@ usr/include/WINGs/WUtil.h
usr/include/WINGs/WINGs.h
usr/include/WINGs/WINGsP.h
usr/lib/pkgconfig/WINGs.pc
+usr/lib/pkgconfig/WUtil.pc
usr/lib/libWINGs.a
usr/lib/libWUtil.a
usr/lib/libWUtil.so
http://repo.or.cz/w/wmaker-crm.git/commit/bb69682b88bdb9d4abaf32bf9f5b2f9fb80c2c23
commit bb69682b88bdb9d4abaf32bf9f5b2f9fb80c2c23
Author: David Maciejak <[email protected]>
Date: Sat Mar 8 11:02:08 2014 +0800
wrlib: added support for imagemagick third-party lib
It uses to provide some missing common image format
like SVG, BMP, PICT, ...
diff --git a/configure.ac b/configure.ac
index a0aca45a..3d42c610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -322,6 +322,11 @@ 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 =======
@@ -559,6 +564,26 @@ else
fi
AC_SUBST(FCLIBS)
+dnl
+dnl libMagickWand
+dnl
+AC_MSG_CHECKING([for libmagickwand header])
+IMFLAGS=`$MAGICKWCONFIG --cflags`
+if test "x$IMFLAGS" = "x" ; then
+ AC_MSG_RESULT([not found])
+else
+ AC_MSG_RESULT([found])
+fi
+AC_SUBST(IMFLAGS)
+
+AC_MSG_CHECKING([for libmagickwand library])
+IMLIBS=`$MAGICKWCONFIG --ldflags`
+if test "x$IMLIBS" = "x" ; then
+ AC_MSG_RESULT([not found])
+else
+ AC_MSG_RESULT([found])
+fi
+AC_SUBST(IMLIBS)
dnl Xft2 antialiased font support
dnl =============================
@@ -690,6 +715,17 @@ AC_ARG_ENABLE([webp],
WM_IMGFMT_CHECK_WEBP
+dnl MAGICK Support
+dnl ===========
+AC_ARG_ENABLE([magick],
+ [AS_HELP_STRING([--disable-magick], [disable MAGICK support through
libMagickWand])],
+ [AS_CASE(["$enableval"],
+ [yes|no], [],
+ [AC_MSG_ERROR([bad value $enableval for --enable-magick])] )],
+ [enable_magick=auto])
+WM_IMGFMT_CHECK_MAGICK
+
+
dnl PPM Support
dnl ===========
# The PPM format is always enabled because we have built-in support for the
format
diff --git a/m4/wm_imgfmt_check.m4 b/m4/wm_imgfmt_check.m4
index ad37993a..af43f717 100644
--- a/m4/wm_imgfmt_check.m4
+++ b/m4/wm_imgfmt_check.m4
@@ -244,3 +244,26 @@ AS_IF([test "x$enable_xpm" = "xno"],
])
AM_CONDITIONAL([USE_XPM], [test "x$enable_xpm" != "xno"])dnl
]) dnl AC_DEFUN
+
+
+# WM_IMGFMT_CHECK_MAGICK
+# ----------------------
+#
+# Check for MagickWand library to support more image file formats
+# The check depends on variable 'enable_magick' being either:
+# yes - detect, fail if not found
+# no - do not detect, disable support
+# auto - detect, disable if not found
+#
+# When found, store the appropriate compilation flags in MAGICKFLAGS
+# 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"
+ 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
+]) dnl AC_DEFUN
diff --git a/src/dialog.c b/src/dialog.c
index 1341af8c..541bd748 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -1297,6 +1297,10 @@ void wShowInfoPanel(WScreen *scr)
strbuf = wstrappend(strbuf, ", MWM");
#endif
+#ifdef USE_MAGICK
+ strbuf = wstrappend(strbuf, ", ImageMagick");
+#endif
+
#ifdef USE_XINERAMA
strbuf = wstrappend(strbuf, _("n"));
#ifdef SOLARIS_XINERAMA
diff --git a/src/main.c b/src/main.c
index a21290e5..bc147216 100644
--- a/src/main.c
+++ b/src/main.c
@@ -201,6 +201,7 @@ noreturn void Exit(int status)
if (dpy)
XCloseDisplay(dpy);
+ RShutdown(); /* wrlib clean exit */
wutil_shutdown(); /* WUtil clean-up */
exit(status);
diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index 48af352a..daf4a1ff 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -64,6 +64,10 @@ if USE_WEBP
libwraster_la_SOURCES += load_webp.c
endif
+if USE_MAGICK
+libwraster_la_SOURCES += load_magick.c
+endif
+
AM_CPPFLAGS = $(DFLAGS) @HEADER_SEARCH_PATH@
libwraster_la_LIBADD = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ @LIBXMU@ -lm
diff --git a/wrlib/imgformat.h b/wrlib/imgformat.h
index 43df3ec9..f60c9659 100644
--- a/wrlib/imgformat.h
+++ b/wrlib/imgformat.h
@@ -39,12 +39,13 @@ typedef enum {
IM_PPM = 4,
IM_JPEG = 5,
IM_GIF = 6,
- IM_WEBP = 7
+ IM_WEBP = 7,
+ IM_MAGICK = 8
} WRImgFormat;
/* How many image types we have. */
/* Increase this when adding new image types! */
-#define IM_TYPES 7
+#define IM_TYPES 8
/*
* Function for Loading in a specific format
@@ -73,6 +74,10 @@ RImage *RLoadGIF(const char *file, int index);
RImage *RLoadWEBP(const char *file);
#endif
+#ifdef USE_MAGICK
+RImage *RLoadMagick(const char *file_name);
+#endif
+
/*
* Function for Saving in a specific format
*/
diff --git a/wrlib/libwraster.map b/wrlib/libwraster.map
index 6282e2c4..6e165ef0 100644
--- a/wrlib/libwraster.map
+++ b/wrlib/libwraster.map
@@ -72,6 +72,7 @@ LIBWRASTER3
RRotateImage;
RSaveImage;
RScaleImage;
+ RShutdown;
RSmoothScaleImage;
RSupportedFileFormats;
diff --git a/wrlib/load.c b/wrlib/load.c
index 641cfae6..df0ae9ff 100644
--- a/wrlib/load.c
+++ b/wrlib/load.c
@@ -103,6 +103,13 @@ 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;
@@ -165,8 +172,16 @@ RImage *RLoadImage(RContext * context, const char *file,
int index)
return NULL;
case IM_UNKNOWN:
+#ifdef USE_MAGICK
+ /* generic file format support using ImageMagick
+ * BMP, PCX, PICT, SVG, ...
+ */
+ image = RLoadMagick(file);
+ break;
+#else
RErrorCode = RERR_BADFORMAT;
return NULL;
+#endif
case IM_XPM:
image = RLoadXPM(context, file);
diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c
new file mode 100644
index 00000000..397ed34d
--- /dev/null
+++ b/wrlib/load_magick.c
@@ -0,0 +1,88 @@
+/* load_magick.c - load image file using ImageMagick
+ *
+ * Raster graphics library
+ *
+ * Copyright (c) 2014 Window Maker Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "config.h"
+#include <X11/Xlib.h>
+
+#include <wand/magick_wand.h>
+
+#include "wraster.h"
+#include "imgformat.h"
+
+
+RImage *RLoadMagick(const char *file_name)
+{
+ RImage *image = NULL;
+ unsigned char *ptr;
+ unsigned long w,h;
+ MagickWand *m_wand = NULL;
+ MagickBooleanType mrc;
+ MagickBooleanType hasAlfa;
+ PixelWand *bg_wand = NULL;
+
+ MagickWandGenesis();
+
+ /* Create a wand */
+ m_wand = NewMagickWand();
+
+ /* set the default background as transparent */
+ bg_wand = NewPixelWand();
+ PixelSetColor(bg_wand, "none");
+ MagickSetBackgroundColor(m_wand, bg_wand);
+
+ /* Read the input image */
+ if (!MagickReadImage(m_wand, file_name)) {
+ RErrorCode = RERR_BADIMAGEFILE;
+ goto bye;
+ }
+
+ w = MagickGetImageWidth(m_wand);
+ h = MagickGetImageHeight(m_wand);
+
+ hasAlfa = MagickGetImageAlphaChannel(m_wand);
+
+ image = RCreateImage(w, h, (unsigned int) hasAlfa);
+ if (!image) {
+ RErrorCode = RERR_NOMEMORY;
+ goto bye;
+ }
+
+ ptr = image->data;
+ if (hasAlfa == MagickTrue)
+ mrc = MagickExportImagePixels(m_wand, 0, 0, (size_t)w,
(size_t)h, "RGBA", CharPixel, ptr);
+ else
+ mrc = MagickExportImagePixels(m_wand, 0, 0, (size_t)w,
(size_t)h, "RGB", CharPixel, ptr);
+
+ if (mrc == MagickFalse) {
+ RErrorCode = RERR_BADIMAGEFILE;
+ RReleaseImage(image);
+ goto bye;
+ }
+
+bye:
+ /* Tidy up */
+ DestroyPixelWand(bg_wand);
+ MagickClearException(m_wand);
+ m_wand = DestroyMagickWand(m_wand);
+
+ return image;
+}
diff --git a/wrlib/wraster.h b/wrlib/wraster.h
index 25e39e79..c4ed2310 100644
--- a/wrlib/wraster.h
+++ b/wrlib/wraster.h
@@ -431,7 +431,11 @@ 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
http://repo.or.cz/w/wmaker-crm.git/commit/b6ffe90ec4b53122446c9b1ada9e82677e9bfdde
commit b6ffe90ec4b53122446c9b1ada9e82677e9bfdde
Author: Christophe CURIS <[email protected]>
Date: Wed Apr 16 22:59:35 2014 +0200
WINGs: Changed algorithm to resize a pixmap while keeping aspect ratio
The original code would not provide correctly sized images in some cases
of ratios on the original image and on the requested size.
Signed-off-by: Christophe CURIS <[email protected]>
diff --git a/WINGs/wpixmap.c b/WINGs/wpixmap.c
index d5800a4d..272e56ac 100644
--- a/WINGs/wpixmap.c
+++ b/WINGs/wpixmap.c
@@ -134,14 +134,23 @@ WMPixmap *WMCreateScaledBlendedPixmapFromFile(WMScreen
*scrPtr, const char *file
/* scale it if needed to fit in the specified box */
if ((width > 0) && (height > 0) && ((image->width > width) ||
(image->height > height))) {
- RImage *tmp;
-
- tmp = image;
- if (image->width > image->height)
- image = RScaleImage(tmp, width, image->height * height
/ image->width);
- else
- image = RScaleImage(tmp, image->width * width /
image->height, height);
- RReleaseImage(tmp);
+ int new_width, new_height;
+ RImage *new_image;
+
+ new_width = image->width;
+ new_height = image->height;
+ if (new_width > width) {
+ new_width = width;
+ new_height = width * image->height / image->width;
+ }
+ if (new_height > height) {
+ new_width = height * image->width / image->height;
+ new_height = height;
+ }
+
+ new_image = RScaleImage(image, new_width, new_height);
+ RReleaseImage(image);
+ image = new_image;
}
RCombineImageWithColor(image, color);
http://repo.or.cz/w/wmaker-crm.git/commit/36159c614f67e7481d86159434cd6a6b273f23b5
commit 36159c614f67e7481d86159434cd6a6b273f23b5
Author: Christophe CURIS <[email protected]>
Date: Sun Apr 6 00:11:57 2014 +0200
wmaker: Scale image to make them fit in the preview panel
Signed-off-by: Carlos R. Mafra <[email protected]>
diff --git a/WINGs/WINGs/WINGs.h b/WINGs/WINGs/WINGs.h
index 7149aeb6..dd3fac54 100644
--- a/WINGs/WINGs/WINGs.h
+++ b/WINGs/WINGs/WINGs.h
@@ -843,6 +843,11 @@ WMPixmap* WMCreateBlendedPixmapFromRImage(WMScreen
*scrPtr, RImage *image,
WMPixmap* WMCreateBlendedPixmapFromFile(WMScreen *scrPtr, const char *fileName,
const RColor *color);
+WMPixmap* WMCreateScaledBlendedPixmapFromFile(WMScreen *scrPtr, const char
*fileName,
+ const RColor *color,
+ unsigned int width,
+ unsigned int height);
+
void WMDrawPixmap(WMPixmap *pixmap, Drawable d, int x, int y);
Pixmap WMGetPixmapXID(WMPixmap *pixmap);
diff --git a/WINGs/wpixmap.c b/WINGs/wpixmap.c
index 55c457b4..d5800a4d 100644
--- a/WINGs/wpixmap.c
+++ b/WINGs/wpixmap.c
@@ -119,6 +119,12 @@ WMPixmap *WMCreateBlendedPixmapFromRImage(WMScreen *
scrPtr, RImage * image, con
WMPixmap *WMCreateBlendedPixmapFromFile(WMScreen * scrPtr, const char
*fileName, const RColor * color)
{
+ return WMCreateScaledBlendedPixmapFromFile(scrPtr, fileName, color, 0,
0);
+}
+
+WMPixmap *WMCreateScaledBlendedPixmapFromFile(WMScreen *scrPtr, const char
*fileName, const RColor *color,
+ unsigned int width, unsigned int
height)
+{
WMPixmap *pixPtr;
RImage *image;
@@ -126,10 +132,20 @@ WMPixmap *WMCreateBlendedPixmapFromFile(WMScreen *
scrPtr, const char *fileName,
if (!image)
return NULL;
- RCombineImageWithColor(image, color);
+ /* scale it if needed to fit in the specified box */
+ if ((width > 0) && (height > 0) && ((image->width > width) ||
(image->height > height))) {
+ RImage *tmp;
- pixPtr = WMCreatePixmapFromRImage(scrPtr, image, 0);
+ tmp = image;
+ if (image->width > image->height)
+ image = RScaleImage(tmp, width, image->height * height
/ image->width);
+ else
+ image = RScaleImage(tmp, image->width * width /
image->height, height);
+ RReleaseImage(tmp);
+ }
+ RCombineImageWithColor(image, color);
+ pixPtr = WMCreatePixmapFromRImage(scrPtr, image, 0);
RReleaseImage(image);
return pixPtr;
diff --git a/src/dialog.c b/src/dialog.c
index 4ca4d84d..1341af8c 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -619,7 +619,8 @@ static void setViewedImage(IconPanel *panel, const char
*file)
color.green = 0xaa;
color.blue = 0xae;
color.alpha = 0;
- pixmap = WMCreateBlendedPixmapFromFile(WMWidgetScreen(panel->win),
file, &color);
+ pixmap =
WMCreateScaledBlendedPixmapFromFile(WMWidgetScreen(panel->win), file, &color,
75, 75);
+
if (!pixmap) {
WMSetButtonEnabled(panel->okButton, False);
@@ -742,7 +743,7 @@ static void drawIconProc(WMList * lPtr, int index, Drawable
d, char *text, int s
color.blue = WMBlueComponentOfColor(back) >> 8;
color.alpha = WMGetColorAlpha(back) >> 8;
- pixmap = WMCreateBlendedPixmapFromFile(wmscr, file, &color);
+ pixmap = WMCreateScaledBlendedPixmapFromFile(wmscr, file, &color, width
- 2, height - 2);
wfree(file);
if (!pixmap) {
diff --git a/src/dockedapp.c b/src/dockedapp.c
index 19d55bbd..63a4864d 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -103,7 +103,7 @@ static void updateSettingsPanelIcon(AppSettingsPanel *
panel)
color.green = 0xaa;
color.blue = 0xae;
color.alpha = 0;
- pixmap =
WMCreateBlendedPixmapFromFile(WMWidgetScreen(panel->win), path, &color);
+ pixmap =
WMCreateScaledBlendedPixmapFromFile(WMWidgetScreen(panel->win), path, &color,
64, 64);
if (!pixmap) {
WMSetLabelImage(panel->iconLabel, NULL);
} else {
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
m4/wm_imgfmt_check.m4 | 7 +++++--
po/be.po | 6 +++---
po/bg.po | 6 +++---
po/ca.po | 6 +++---
po/cs.po | 6 +++---
po/da.po | 6 +++---
po/de.po | 6 +++---
po/es.po | 6 +++---
po/et.po | 6 +++---
po/fi.po | 6 +++---
po/fr.po | 6 +++---
po/hu.po | 10 +++++-----
po/hy.po | 4 ++--
po/it.po | 6 +++---
po/ja.po | 6 +++---
po/ko.po | 10 +++++-----
po/ms.po | 6 +++---
po/nl.po | 4 ++--
po/ru.po | 4 ++--
po/sk.po | 6 +++---
po/zh_TW.po | 6 +++---
src/dialog.c | 6 +++---
wrlib/imgformat.h | 7 +++----
wrlib/load.c | 2 +-
wrlib/load_magick.c | 10 ++++------
26 files changed, 78 insertions(+), 77 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
