From 138cc0266262535c1661a827389ceb7dbbde0d33 Mon Sep 17 00:00:00 2001
From: yuichitamiya <y2miyacatsfab@gmail.com>
Date: Sat, 5 Feb 2022 22:13:27 +0900
Subject: [PATCH] fix week1&2 about imagamagic
---
docs/Instruction/week01.md | 8 +++++++-
docs/Instruction/week02.md | 31 +++++++++++++++++++------------
2 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/docs/Instruction/week01.md b/docs/Instruction/week01.md
index ebdf0af..7648ad1 100644
--- a/docs/Instruction/week01.md
+++ b/docs/Instruction/week01.md
@@ -283,8 +283,14 @@ Tips 2020 [ffmpeg example](https://fabacademy.org/2020/labs/kannai/students/tats
0.5M output.jpg
```
+
#### imagemagic
-[site](https://imagemagick.org/)
+```
+% cd ~
+% brew install imagemagick
+```
+
+[week2](./week02.md#compress images and videos)
## The Fab Charter
diff --git a/docs/Instruction/week02.md b/docs/Instruction/week02.md
index 9eb1ab6..b250940 100644
--- a/docs/Instruction/week02.md
+++ b/docs/Instruction/week02.md
@@ -56,7 +56,7 @@ and post a description with your design files on your class page
- [GIMP](https://www.gimp.org/)
- Photoshop
-- vector
+- Vector
- [Inkscape](https://inkscape.org/)
- Illustrator
- CorelDRAW
@@ -64,7 +64,7 @@ and post a description with your design files on your class page
### 3D design
- Fusion360 -> parametric design
- [OnShape](https://www.onshape.com/en/)
- - create account link in the email
+ - create account link in the email
- [Blender](https://www.blender.org/)
- [Wakayama Univ](https://drive.google.com/file/d/1m2lOC0plHx6fswb_4jUQ_SRqHF8zOAIW/view?usp=sharing)
- ZBrush
@@ -93,15 +93,22 @@ and post a description with your design files on your class page
- [imagemagick](https://imagemagick.org/index.php)
- [encoding](http://academy.cba.mit.edu/classes/computer_design/image.html)
```
-convert PNG to JPG:
- convert input.png output.jpg
-convert all PNGs to JPGs:
- mogrify -format jpg *.png
-convert SVG to PNG at 1000 DPI:
- convert -density 1000 -units PixelsPerInch input.svg output.png
-compress JPG to quality 50% width 1000:
- convert input.jpg -quality 50% -resize 1000 output.jpg
-compress all JPGs to quality 50% width 1000:
- mogrify -quality 50% -resize 1000 *.jpg
+//convert PNG to JPG:
+% convert input.png output.jpg
+
+//convert all PNGs to JPGs:
+% mogrify -format jpg *.png
+
+//convert SVG to PNG at 1000 DPI:
+% convert -density 1000 -units PixelsPerInch input.svg output.png
+
+//compress JPG to quality 50% width 1000:
+% convert input.jpg -quality 50% -resize 1000 output.jpg
+
+//compress all JPGs to quality 50% width 1000:
+% mogrify -quality 50% -resize 1000 *.jpg
```
+
- ffmpeg
+
+[week1](./week01.md#ffmpeg)
--
GitLab