Merge pull request #12 from umjammer/1.0.11

1.0.11

Author: umjammer

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: build
+    - name: Build
       run: |
         brew install ffmpeg
         mvn -B install --file pom.xml

.github/workflows/maven-publish.yml

@@ -10,22 +10,24 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        cache: maven
-        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-        settings-path: ${{ github.workspace }} # location for the settings.xml file
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    - name: Build with Maven
-      run: |
-        brew install ffmpeg
-        mvn -B package --file pom.xml
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: maven
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
 
-    - name: Publish to GitHub Packages Apache Maven
-      run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
+      - name: Build with Maven
+        run: |
+          brew install ffmpeg
+          mvn -B package --file pom.xml
+
+      - name: Publish to GitHub Packages Apache Maven
+        run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml -Dmaven.test.skip=true
+        env:
+          GITHUB_TOKEN: ${{ github.token }}

.github/workflows/maven.yml

@@ -8,14 +8,21 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v3
-      with:
-        java-version: '8'
-        distribution: 'temurin'
-        cache: maven
-    - name: Build with Maven
-      run: |
-        brew install ffmpeg
-        mvn -B package --file pom.xml
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Check w/o SNAPSHOT when "bump version"
+        if: ${{ contains(github.event.head_commit.message, 'bump version') }}
+        run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        run: |
+          brew install ffmpeg
+          mvn -B package --file pom.xml

README.md

@@ -13,6 +13,9 @@
   * [artmaster 88](http://fileformats.archiveteam.org/wiki/ArtMaster88) (old school japanese pc-8801,9801 image format)
   * [mag](https://ja.wikipedia.org/wiki/MAG%E3%83%95%E3%82%A9%E3%83%BC%E3%83%9E%E3%83%83%E3%83%88) (maki-chan graphic loader: old school japanese pc-8801,9801 image format)
   * [zim](https://ja.wikipedia.org/wiki/%E3%83%84%E3%82%A1%E3%82%A4%E3%83%88#Z's_STAFF) (z's staff kid: old school japanese 9801 image format)
+  * [maki](https://mooncore.eu/bunny/txt/makichan.htm) (old school japanese pc-8801,9801,x68000 image format)
+  * [pic](https://ja.wikipedia.org/wiki/PIC_(%E7%94%BB%E5%83%8F%E5%9C%A7%E7%B8%AE)) (old school japanese x68000 image format)
+  * [pi](http://justsolve.archiveteam.org/wiki/Pi_(image_format)) (old school japanese pc-9801 image format)
   * [windows bitmap](https://www.google.co.jp/books/edition/Windows3_1%E3%82%B0%E3%83%A9%E3%83%95%E3%82%A3%E3%83%83%E3%82%AF%E3%83%97%E3%83%AD%E3%82%B0%E3%83%A9/YEYsAgAACAAJ?hl=ja)
   * gif ([non lzw](https://web.archive.org/web/20161106215528/http://homepage1.nifty.com/uchi/software.htm))
   * windows icon
@@ -50,12 +53,15 @@
  * Lanczos3 filter using AWT API
  * `BufferedImageOp` ???
  * https://github.com/iariro/N88BasicImage
- * ffmpeg resize 4byte 32bit operation is wrong
+ * ~~ffmpeg resize 4byte 32bit operation is wrong~~
+ * DaVinchi (wip)
+ * n88basic image format (wip)
+ * yet another pic image format (wip)
 
 ## Tech Know
 
  * Mac Open JDK's JNI library extension is `.dylib`
- * `libsescale` has MMX bug, this causes segmentation fault when resizing image.
+ * ~~`libsescale` has MMX bug, this causes segmentation fault when resizing image.~~
 
 ## References
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>vavi</groupId>
   <artifactId>vavi-image</artifactId>
-  <version>1.0.10-SNAPSHOT</version>
+  <version>1.0.11</version>
 
   <name>Vavi Imaging API</name>
   <organization>
@@ -113,11 +113,10 @@
             </executions>
           </plugin>
 
-
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-install-plugin</artifactId>
-            <version>3.0.0-M1</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>install-library</id>
@@ -153,7 +152,7 @@
              -->
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
-            <version>1.6.0</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>deploy-library</id>
@@ -180,6 +179,12 @@
             </configuration>
           </plugin>
 
+          <plugin>
+            <!-- ⚠⚠⚠ AD-HOC after 2.5 causes #13 ⚠⚠⚠ -->
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>2.5</version>
+          </plugin>
+
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -224,7 +229,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.0</version>
+        <version>5.9.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -235,7 +240,7 @@
     <dependency>
       <groupId>com.github.umjammer</groupId>
       <artifactId>vavi-commons</artifactId>
-      <version>1.1.8</version>
+      <version>1.1.9</version>
     </dependency>
     <dependency>
       <groupId>com.github.umjammer</groupId>

src/main/java/vavi/awt/image/am88/ArtMasterImage.java

@@ -19,6 +19,9 @@
 
 /**
  * ArtMasterImage.
+ * <p>
+ * magic SS_SIF
+ * separated RGB RLE
  *
  * @author <a href="mailto:umjammer@gmail.com">Naohide Sano</a> (umjammer)
  * @version 0.00 2019/04/10 umjammer initial version <br>
@@ -96,7 +99,7 @@ public ArtMasterImage(InputStream in) throws IOException {
 
         for (int i = 0; i < 3; i++) {
 
-            byte[] g = null;
+            byte[] g;
             int count = 0;
 
             switch (buf[19 + i]) {

src/main/java/vavi/awt/image/bmp/WindowsBitmap.java

@@ -181,7 +181,7 @@ public void setUsedColor(int colors) {
         system16IndexColorModel = new IndexColorModel(4, 16, reds, greens, blues);
 
         // 256
-        String colorTablePath = null;
+        String colorTablePath;
 //        if ("".equals(System.getProperty("os.type"))) {
             colorTablePath = "/vavi/awt/image/resources/WindowsSystem.ACT";
 //        }

src/main/java/vavi/awt/image/gif/NonLzwGifDecoder.java

@@ -81,7 +81,7 @@ public byte[] decode(byte[] data,
 
         byte[] vram = new byte[height * bytesPerLine];
         int[] lzw = new int[8192]; // 圧縮データ格納用配列(辞書テーブルではない！)
-        int code = 0; // 符号化コード初期化
+        int code; // 符号化コード初期化
 
         // DIB データ書き込み用構造体初期化
         RgbContext rgb = new RgbContext();

src/main/java/vavi/awt/image/ico/WindowsIcon.java

@@ -56,7 +56,7 @@ public class WindowsIcon {
     private BufferedImage image;
 
     /** マスク */
-    private byte mask[];
+    private byte[] mask;
 
     /** アイコンを作成します． */
     public WindowsIcon(WindowsIconDevice device, WindowsBitmap bitmap) {

src/main/java/vavi/awt/image/ico/WindowsIconImageSource.java

@@ -62,7 +62,7 @@ public synchronized void addConsumer(ImageConsumer ic) {
                 ic.setColorModel(cm);
 //Debug.println(image.getType() + ", " + cm);
                 ic.setHints(ImageConsumer.TOPDOWNLEFTRIGHT | ImageConsumer.COMPLETESCANLINES | ImageConsumer.SINGLEPASS | ImageConsumer.SINGLEFRAME);
-                int[] buf = image.getRGB(0, 0, width, height, (int[]) null, 0, width);
+                int[] buf = image.getRGB(0, 0, width, height, null, 0, width);
 //Debug.println(buf.length + ", " + width * height);
                 ic.setPixels(0, 0, width, height, ColorModel.getRGBdefault(), buf, 0, width); // colorModel ???
                 ic.imageComplete(ImageConsumer.STATICIMAGEDONE);