mirror of
https://github.com/JanJastrow/.dotfiles.git
synced 2024-11-22 02:29:57 +01:00
merge
This commit is contained in:
commit
f3378219e6
@ -49,7 +49,11 @@ function pushover() {
|
|||||||
https://api.pushover.net/1/messages.json
|
https://api.pushover.net/1/messages.json
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
# png to jpg 95
|
# png to jpg 95
|
||||||
|
=======
|
||||||
|
# png to jpg 85
|
||||||
|
>>>>>>> parent of d1425c4 (Increase jpg quality)
|
||||||
function png2web() {
|
function png2web() {
|
||||||
findpath=$1
|
findpath=$1
|
||||||
: "${findpath:="."}"
|
: "${findpath:="."}"
|
||||||
@ -57,7 +61,11 @@ function png2web() {
|
|||||||
dir=$(dirname "$f");
|
dir=$(dirname "$f");
|
||||||
file=$(basename "$f");
|
file=$(basename "$f");
|
||||||
name="${file%.*}";
|
name="${file%.*}";
|
||||||
|
<<<<<<< HEAD
|
||||||
magick convert "$f" pnm:- | cjpeg -progressive -quality 95 > "$dir/$name.jpg" </dev/null
|
magick convert "$f" pnm:- | cjpeg -progressive -quality 95 > "$dir/$name.jpg" </dev/null
|
||||||
|
=======
|
||||||
|
magick convert "$f" pnm:- | cjpeg -progressive -quality 85 > "$dir/$name.jpg" </dev/null
|
||||||
|
>>>>>>> parent of d1425c4 (Increase jpg quality)
|
||||||
rm -f "$f";
|
rm -f "$f";
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user