 |
Fix pointer handling with new magick syntax: - annna - Annna the nice friendly … |
 |
git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws6… |
 |
Log |
|
Files |
|
Refs |
|
Tags |
|
README |
|
--- |
|
commit d5a8213c0e0107e0bec92f313807be80c498b293 |
|
parent 117989fce0da6e5608cd881af0928a50085b7fe7 |
|
Author: Annna Robert-Houdin <[email protected]> |
|
Date: Thu, 13 Nov 2025 20:27:30 +0100 |
|
|
|
Fix pointer handling with new magick syntax: |
|
|
|
https://github.com/ImageMagick/ImageMagick/issues/7484 |
|
|
|
Diffstat: |
|
M annna-message-common | 2 +- |
|
M pointer | 20 +++++++------------- |
|
|
|
2 files changed, 8 insertions(+), 14 deletions(-) |
|
--- |
|
diff --git a/annna-message-common b/annna-message-common |
|
@@ -1351,7 +1351,7 @@ do |
|
inpath="${outpath}"; |
|
continue |
|
fi |
|
- pointer "${inpath}" "${outpath}" >/dev… |
|
+ pointer "${inpath}" "${outpath}"; |
|
inpath="${outpath}"; |
|
done | tail -n 1)" |
|
|
|
diff --git a/pointer b/pointer |
|
@@ -1,4 +1,4 @@ |
|
-#!/bin/sh |
|
+#!/bin/bash |
|
|
|
die() { |
|
[ -n "$1" ] && printf '%s\n' "$1" >&2 |
|
@@ -18,8 +18,7 @@ video/*) |
|
[ -e "${in}" ] && rm -f "${in}" |
|
die |
|
fi |
|
- rminfile=1 |
|
- ;; |
|
+ rminfile=1;; |
|
image/png*) |
|
# imagemagick text draw on png files is broken, |
|
# tested on gentoo imagemagick version 7.1.0-48 |
|
@@ -30,14 +29,9 @@ image/png*) |
|
rm "${in}" |
|
die |
|
fi |
|
- rminfile=1 |
|
- ;; |
|
-image/*) |
|
- in="$1" |
|
- ;; |
|
-*) |
|
- die "file type '${mimetype}' not supported" |
|
- ;; |
|
+ rminfile=1;; |
|
+image/*) in="$1";; |
|
+*) die "file type '${mimetype}' not supported";; |
|
esac |
|
|
|
n="${1##*/}" |
|
@@ -45,10 +39,10 @@ n="${n%.*}" |
|
tmp="$(mktemp tmp.XXXXXXXXX.jpg)" |
|
magick \ |
|
\( \ |
|
- +append \ |
|
"${in}" \ |
|
- /home/annna/bin/modules/filter-media/pointer.jpg \ |
|
+ "${ANNNA_MODBASE}/filter-media/pointer.jpg" \ |
|
-resize x500 \ |
|
+ +append \ |
|
\) \ |
|
-pointsize 50 -fill white \ |
|
-stroke black -strokewidth 1 \ |
