Skip to content

Commit fc885d6

Browse files
committed
Merge branch 'dev' into master-merge
2 parents a7425ee + 4030331 commit fc885d6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+613
-160
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Steps to reproduce the behavior:
1616
**Expected behavior**
1717
A clear and concise description of what you expected to happen.
1818

19-
**Screenshots**
20-
If applicable, add screenshots to help explain your problem.
19+
**Screenshots and/or Log Text**
20+
If applicable, add screenshots to help explain your problem. For macOS GUI and macOS right-click menu service problems, please copy and paste the text from the log file `~/.crunch/crunch.log` into your bug report (requires Crunch v3.0.0 or higher).
2121

2222
**Desktop (please complete the following information):**
2323
- OS: [e.g. macOS]

CHANGELOG.md

+17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
## Changelog
22

3+
### v3.0.0
4+
5+
- improved quality of pngquant quantization of PNG images across all file sizes
6+
- upgraded embedded pngquant to v2.12.0 (includes reduced pngquant optimization times)
7+
- converted to custom build of zopflipng that is modified for use in the Crunch applications (forked from google/zopfli at git tag zopfli-1.0.2) at git version tag v2.1.0 (source repository is chrissimpkins/zopfli)
8+
- improved zopfli compression ratios for post-quantized and non-quantized in-file sizes under 350kB. Many files are ~33% original file size after they are quantized with pngquant so this affects pre-optimization files up to just over ~1MB in size when the pngquant step is completed (the quantize step yields a modified image binary when it does not lead to larger file size or image quality below Crunch project thresholds, when this does not occur the original file at the original file size is used as the in-file to zopflipng)
9+
- improved zopfli compression speed for post-quantized and non-quantized in-file sizes over 750kB
10+
- eliminate optional PNG chunks by default in all files (reduces file size)
11+
- converted to use of PNG filter = 0 for zopflipng compression of all quantized files (increases compression speed)
12+
- use automated detection of best PNG filter for zopfli compression in all non-quantized files (improves compression)
13+
- remove hidden colors behind alpha channel 0 in files that are not quantized due to low quality or increased file size following pngquant runs
14+
- added new macOS GUI animations with success and fail indicators (thanks Gary Jacobs!)
15+
- added logging of compression data and errors in macOS GUI and macOS right-click menu service tools in a new log file that is generated on the path `~/.crunch/crunch.log`
16+
- updated redirect to /dev/null in install-dependencies.sh compile script for POSIX compliance
17+
- refactored command line option parsing code (thanks Chris Clauss!)
18+
- added new bug reporting template
19+
320
### v2.1.0
421

522
- added automated detection of png image types through read of PNG file signatures

README.md

+20-18
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ Select one or more PNG images in the Finder, right-click, and select the `Servic
5050

5151
## Examples
5252

53-
The following examples demonstrate the benefits and disadvantages of the current iteration of Crunch's aggressive space saving optimization strategy. In many cases, the PNG optimization minimizes file size with an imperceptible decrease in image quality. In some cases, degradation of image quality is visible. For example, view the horizon line + clouds in the prairie photo below for a demonstration of the introduction of undesirable image artifacts in the image. Experiment with the image types that you use and please submit a report with examples of any images where the image quality falls short of expectations for production-ready files.
53+
The following examples demonstrate the benefits and disadvantages of the current iteration of Crunch's aggressive space saving optimization strategy. In many cases, the PNG optimization minimizes file size with an imperceptible decrease in image quality. In some cases, degradation of image quality is visible. View the horizon line in the prairie photo below for a demonstration of an undesirable artifact that is introduced with image processing. Experiment with the image types that you use and please submit a report with examples of any images where the image quality falls short of expectations for production-ready files.
5454

5555
## Photography Examples
5656

5757
### Cat Image
5858

5959
- Original Size: 583,398 bytes
60-
- Optimized Size: 195,430 bytes
61-
- DSSIM similarity score: 0.001504
62-
- Percent original size: 33.50%
60+
- Optimized Size: 196,085 bytes
61+
- DSSIM similarity score: 0.001471
62+
- Percent original size: 33.61%
6363

6464
##### Original
6565

@@ -72,9 +72,9 @@ The following examples demonstrate the benefits and disadvantages of the current
7272
### Sun's Rays
7373

7474
- Original Size: 138,272
75-
- Optimized Size: 64,982
76-
- DSSIM similarity score: 0.000913
77-
- Percent original size: 47.00%
75+
- Optimized Size: 66,593
76+
- DSSIM similarity score: 0.000948
77+
- Percent original size: 48.16%
7878

7979
##### Original
8080

@@ -88,7 +88,7 @@ The following examples demonstrate the benefits and disadvantages of the current
8888
### Prairie Image
8989

9090
- Original Size: 196,794 bytes
91-
- Optimized Size: 77,968 bytes
91+
- Optimized Size: 77,965 bytes
9292
- DSSIM similarity score: 0.002988
9393
- Percent original size: 39.62%
9494

@@ -107,9 +107,9 @@ The following examples demonstrate the benefits and disadvantages of the current
107107
### Robot Image
108108

109109
- Original Size: 197,193 bytes
110-
- Optimized Size: 67,773 bytes
111-
- DSSIM similarity score: 0.000163
112-
- Percent original size: 34.37%
110+
- Optimized Size: 67,596 bytes
111+
- DSSIM similarity score: 0.000162
112+
- Percent original size: 34.28%
113113

114114
##### Original
115115

@@ -122,9 +122,9 @@ The following examples demonstrate the benefits and disadvantages of the current
122122
### Color Circle Image
123123

124124
- Original Size: 249,251 bytes
125-
- Optimized Size: 67,326 bytes
126-
- DSSIM similarity score: 0.002503
127-
- Percent original size: 27.01%
125+
- Optimized Size: 67,135 bytes
126+
- DSSIM similarity score: 0.002491
127+
- Percent original size: 26.93%
128128

129129
##### Original
130130

@@ -138,9 +138,9 @@ The following examples demonstrate the benefits and disadvantages of the current
138138
### Flowers Image
139139

140140
- Original Size: 440,126 bytes
141-
- Optimized Size: 196,979 bytes
142-
- DSSIM similarity score: 0.000481
143-
- Percent original size: 44.76%
141+
- Optimized Size: 196,962 bytes
142+
- DSSIM similarity score: 0.000480
143+
- Percent original size: 44.75%
144144

145145
##### Original
146146

@@ -164,7 +164,7 @@ Crunch is licensed under the [MIT license](https://github.com/chrissimpkins/Crun
164164

165165
pngquant is licensed under the [Gnu General Public License, version 3](https://github.com/pornel/pngquant/blob/master/COPYRIGHT). The pngquant source code is available [here](https://github.com/pornel/pngquant).
166166

167-
zopflipng is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). The zopflipng source code is available [here](https://github.com/google/zopfli).
167+
zopflipng is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). The upstream zopflipng source code is available [here](https://github.com/google/zopfli). The source for the modified zopflipng fork that is used in this project is available [here](https://github.com/chrissimpkins/zopfli).
168168

169169
See the [LICENSE.md](LICENSE.md) document for details and additional licensing information for this project.
170170

@@ -178,3 +178,5 @@ Crunch is a simple tool that makes excellent, free, open source software built b
178178

179179
- Lode Vandevenne, Jyrki Alakuijala, and the [zopfli project contributors](https://github.com/google/zopfli/graphs/contributors)
180180
- Kornel Lesiński and the [pngquant project contributors](https://github.com/kornelski/pngquant/graphs/contributors)
181+
182+
The fantastic macOS GUI animations were designed by [Gary Jacobs](https://github.com/garyjacobs).

bin/Crunch.app/Contents/Info.plist

0 Bytes
Binary file not shown.
Loading
Loading
Loading
Loading
Loading

bin/Crunch.app/Contents/Resources/Credits.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h3 style="color:#000;">Upgrade</h3>
2626
</p>
2727
<p>To upgrade with Homebrew, enter the following command in your terminal:</p>
2828
<p>
29-
<code style="font-family:Monaco,monospace;padding-left:10px;">$ brew cask uninstall crunch && brew cask install crunch</code>
29+
<code style="font-family:Monaco,monospace;padding-left:10px;">$ brew cask upgrade</code>
3030
</p>
3131

3232
<h3 style="color:#000;">Other Crunch Tools</h3>
@@ -57,4 +57,8 @@ <h3 style="color:#000;">Embedded Software Licenses</h3>
5757

5858
</li>
5959
</ul>
60+
<p></p>
61+
<h3 style="color:#000;">Animations</h3>
62+
<p>The Crunch GUI animations were designed by
63+
<a href="https://github.com/garyjacobs" style="text-decoration: none;"><b>Gary Jacobs</b></a> and are licensed under the MIT License.</p>
6064
</div>

bin/Crunch.app/Contents/Resources/clear.html

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
body,
1010
html {
1111
overflow: hidden;
12+
background-color: #424242;
1213
}
1314

1415
.clear {

bin/Crunch.app/Contents/Resources/complete.html bin/Crunch.app/Contents/Resources/complete-error.html

+2-7
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,21 @@
99
body,
1010
html {
1111
overflow: hidden;
12-
background-color: #FFF;
12+
background-color: #424242;
1313
}
1414

1515
.frame {
16-
height: 200px;
1716
white-space: nowrap;
1817
text-align: center;
1918
}
20-
21-
img {
22-
margin-top: 50px;
23-
}
2419
</style>
2520
</head>
2621

2722
<body>
2823
<!-- page content -->
2924
<div class="frame">
3025
<span class="helper"></span>
31-
<img src="slowdots.gif" height=100>
26+
<img src="04-Error@2x.gif" height="190" width="390">
3227
</div>
3328
</body>
3429

html/complete.html bin/Crunch.app/Contents/Resources/complete-success.html

+2-7
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,21 @@
99
body,
1010
html {
1111
overflow: hidden;
12-
background-color: #FFF;
12+
background-color: #424242;
1313
}
1414

1515
.frame {
16-
height: 200px;
1716
white-space: nowrap;
1817
text-align: center;
1918
}
20-
21-
img {
22-
margin-top: 50px;
23-
}
2419
</style>
2520
</head>
2621

2722
<body>
2823
<!-- page content -->
2924
<div class="frame">
3025
<span class="helper"></span>
31-
<img src="slowdots.gif" height=100>
26+
<img src="04-Success@2x.gif" height="190" width="390">
3227
</div>
3328
</body>
3429

0 commit comments

Comments
 (0)