Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clarify licensing #31

Merged
merged 3 commits into from
Jun 27, 2024
Merged

clarify licensing #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70e478a
rename license to make it more readable on Github
grische Jun 26, 2024
c8b52d6
clarify licensing
grische Jun 26, 2024
ada4f30
transfer image metadata from png to jpg
grische Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 LICENSE → LICENSE.md
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ This repository contains vector graphics of routers used in the [Gluon-Firmware-
It can be equally used for OpenWRT Firmware selectors and the like.

This unifies the valuable work started by [Daniel Krah](https://github.com/Moorviper/Freifunk-Router-Anleitungen), [Julian Labus](https://github.com/belzebub40k/router-pics), [Jan Alexander](https://github.com/nalxnet/freifunk-device-images) and [freifunkstuff](https://github.com/freifunkstuff/meshviewer-hwimages).
The Pictures are available under [CC-BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/).

The pictures are available under [CC-BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/), with exceptions.
Any such exception is marked with a `cc:License` or `cc:license` tag within the respective SVG file or as metadata within the PNG or JPG files.

## Creating JPG and PNG

Expand Down Expand Up @@ -43,4 +45,4 @@ In the [firmware-selector](https://github.com/freifunk-darmstadt/gluon-firmware-
preview_pictures: 'https://map.aachen.freifunk.net/pictures-jpg/',
```

to use the updated central source of jpg files.
to use the updated central source of jpg files.
2 changes: 2 additions & 0 deletions conversion-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,7 @@ for file in pictures-svg/*.svg; do
mogrify -trim "pictures-png/$normalized.png"
# even though mogrify trims the png, we need to trim again for the jpg
convert "pictures-png/$normalized.png" -resize 256x256 -background white -flatten -alpha off -trim "pictures-jpg/$normalized.jpg"
# transfer license and author tags to jpg
exiftool -overwrite_original -tagsfromfile "pictures-png/$normalized.png" "pictures-jpg/$normalized.jpg"
fi
done;