Skip to content

Commit 39f9c7d

Browse files
authored
Merge pull request #14 from umjammer/1.0.12
1.0.12
2 parents 96b7aa9 + 398138b commit 39f9c7d

21 files changed

+323
-183
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ jobs:
1818
analyze:
1919
name: Analyze
2020
runs-on: macos-latest
21+
permissions:
22+
actions: read
23+
contents: read
24+
security-events: write
2125

2226
strategy:
2327
fail-fast: false
@@ -30,24 +34,30 @@ jobs:
3034

3135
steps:
3236
- name: Checkout repository
33-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
3438

3539
# Initializes the CodeQL tools for scanning.
3640
- name: Initialize CodeQL
37-
uses: github/codeql-action/init@v2
41+
uses: github/codeql-action/init@v3
3842
with:
3943
languages: ${{ matrix.language }}
4044
# If you wish to specify custom queries, you can do so here or in a config file.
41-
# By default, queries listed here will override any specified in a config file.
45+
# By default, queries listed here will override any specified in a config file.
4246
# Prefix the list here with "+" to use these queries and those in the config file.
4347
# queries: ./path/to/local/query, your-org/your-repo/queries@main
48+
- name: Set up JDK 17
49+
uses: actions/setup-java@v4
50+
with:
51+
java-version: '17'
52+
distribution: 'temurin'
53+
cache: maven
4454

4555
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4656
# If this step fails, then you should remove it and run the build manually (see below)
4757
- name: Build
4858
run: |
4959
brew install ffmpeg
50-
mvn -B install --file pom.xml
60+
mvn -B install --file pom.xml -Dmaven.test.skip=true
5161
5262
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@v2
63+
uses: github/codeql-action/analyze@v3
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: GitHub Packages (only ffmpeg)
1+
name: GitHub Release Assets
22

33
on:
44
release:
@@ -7,16 +7,16 @@ on:
77
jobs:
88
build:
99

10-
runs-on: macos-latest
10+
runs-on: macos-14
1111

1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

16-
- name: Set up JDK 8
17-
uses: actions/setup-java@v3
16+
- name: Set up JDK 17
17+
uses: actions/setup-java@v4
1818
with:
19-
java-version: '8'
19+
java-version: '17'
2020
distribution: 'temurin'
2121
cache: maven
2222
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
@@ -25,9 +25,11 @@ jobs:
2525
- name: Build with Maven
2626
run: |
2727
brew install ffmpeg
28-
mvn -B package --file pom.xml
28+
mvn -B package --file pom.xml -Dmaven.test.skip=true
2929
30-
- name: Publish to GitHub Packages Apache Maven
31-
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true
30+
- name: Upload Release Asset
31+
uses: softprops/action-gh-release@v1
3232
env:
3333
GITHUB_TOKEN: ${{ github.token }}
34+
with:
35+
files: target/classes/natives/osx_arm64/libFfmpegResampleOpWrapper.dylib

.github/workflows/maven.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [push]
55
jobs:
66
build:
77

8-
runs-on: macos-latest
8+
runs-on: macos-14
99

1010
steps:
1111
- name: Checkout repository
@@ -15,10 +15,10 @@ jobs:
1515
if: ${{ contains(github.event.head_commit.message, 'bump version') }}
1616
run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
1717

18-
- name: Set up JDK 8
18+
- name: Set up JDK 17
1919
uses: actions/setup-java@v3
2020
with:
21-
java-version: '8'
21+
java-version: '17'
2222
distribution: 'temurin'
2323
cache: maven
2424

README.md

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[![Release](https://jitpack.io/v/umjammer/vavi-image.svg)](https://jitpack.io/#umjammer/vavi-image)
22
[![Java CI](https://github.com/umjammer/vavi-image/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-image/actions/workflows/maven.yml)
33
[![CodeQL](https://github.com/umjammer/vavi-image/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-image/actions/workflows/codeql-analysis.yml)
4-
[![GitHub Packages (only ffmpeg)](https://github.com/umjammer/vavi-image/actions/workflows/maven-publish.yml/badge.svg)](https://github.com/umjammer/vavi-image/actions/workflows/maven-publish.yml)
5-
![Java](https://img.shields.io/badge/Java-8-b07219)
4+
![Java](https://img.shields.io/badge/Java-17-b07219)
65

76
# vavi-image
87

@@ -33,18 +32,17 @@
3332

3433
## Quantization
3534

36-
| type |quality|comment|
37-
|----------------------------------------------------------------------------------|---|---|
38-
| [`ImageMagick`](src/main/java/vavi/awt/image/quantization/ImageMagikQuantizeOp.java) |||
39-
| `NeuralNet` |👑|https://github.com/umjammer/vavi-image-sandbox/wiki/OctTree_vs_NeuralNet|
40-
| `OctTree` |||
35+
| type |quality| comment |
36+
|----------------------------------------------------------------------------------|---|----------------------------------------------------------------------------------------|
37+
| [`ImageMagick`](src/main/java/vavi/awt/image/quantization/ImageMagikQuantizeOp.java) || |
38+
| `NeuralNet` |👑| [comparison](https://github.com/umjammer/vavi-image-sandbox/wiki/OctTree-vs-NeuralNet) |
39+
| `OctTree` || |
4140

4241
## Installation
4342

4443
* maven: https://jitpack.io/#umjammer/vavi-image
4544
* if you want to use ffmpeg resizing
46-
* [pom.xml](https://github.com/umjammer/vavi-image/wiki/Install-ffmpeg-native-library)
47-
* exec jvm w/ `java.library.path` system property e.g `-Djava.library.path=/target/test-classes`
45+
* exec jvm w/ `java.library.path` system property e.g `-Djava.library.path=/opt/homebrew/lib`
4846

4947
## TODO
5048

@@ -54,13 +52,13 @@
5452
* `BufferedImageOp` ???
5553
* https://github.com/iariro/N88BasicImage
5654
* ~~ffmpeg resize 4byte 32bit operation is wrong~~
57-
* DaVinchi (wip)
58-
* n88basic image format (wip)
59-
* yet another pic image format (wip)
55+
* DaVinchi (wip, branch:davinch)
56+
* n88basic image format (wip, branch:n88basic)
57+
* yet another pic image format (wip, branch:pic)
6058

6159
## Tech Know
6260

63-
* Mac Open JDK's JNI library extension is `.dylib`
61+
* ~~Mac Open JDK's JNI library extension is `.dylib`~~ already common
6462
* ~~`libsescale` has MMX bug, this causes segmentation fault when resizing image.~~
6563

6664
## References
@@ -71,7 +69,7 @@
7169

7270
### Image I/O PPM Reader
7371

74-
Public Domain
72+
🅮 Public Domain
7573

7674
### ImageMagik
7775

jitpack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
jdk:
2+
- openjdk17

local.properties.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
brew.prefix=/user/local

0 commit comments

Comments
 (0)