Merge branch 'master' into release

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.4.3
+version = 3.6.1
 
 runner.dialect = scala213source3
 fileOverride {

build.sbt

@@ -4,15 +4,15 @@ import java.net.URL
 
 name := "ijp-debayer2sx"
 
-ThisBuild / version := "1.3.3"
+ThisBuild / version := "1.3.3.1-SNAPSHOT"
 ThisBuild / organization := "net.sf.ij-plugins"
 ThisBuild / sonatypeProfileName := "net.sf.ij-plugins"
 ThisBuild / homepage := Some(new URL("https://github.com/ij-plugins/ijp-color"))
 ThisBuild / startYear := Some(2002)
 ThisBuild / licenses := Seq(("LGPL-2.1", new URL("https://opensource.org/licenses/LGPL-2.1")))
 
-ThisBuild / scalaVersion := "2.13.8"
-ThisBuild / crossScalaVersions := Seq("2.13.8", "2.12.16", "3.0.2")
+ThisBuild / scalaVersion := "3.2.1"
+ThisBuild / crossScalaVersions := Seq("3.2.1", "2.13.10", "2.12.17")
 
 publishArtifact := false
 publish / skip := true
@@ -46,12 +46,6 @@ val commonSettings = Seq(
         "-explain"
       )
     ),
-  scalacOptions ++= {
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, 13)) => Seq("-target:8")
-      case _ => Seq.empty[String]
-    }
-  },
   Compile / doc / scalacOptions ++= Opts.doc.title("IJP Debayer2SX API"),
   Compile / doc / scalacOptions ++= Opts.doc.version(version.value),
   Compile / doc / scalacOptions ++= Seq(
@@ -69,8 +63,8 @@ val commonSettings = Seq(
   Compile / compile / javacOptions ++= Seq("-deprecation", "-Xlint", "--release", "8"),
   //
   libraryDependencies ++= Seq(
-    "net.imagej" % "ij" % "1.53s",
-    "org.scalatest" %% "scalatest" % "3.2.11" % "test"
+    "net.imagej" % "ij" % "1.54b",
+    "org.scalatest" %% "scalatest" % "3.2.15" % "test"
   ),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
   //
@@ -104,11 +98,11 @@ lazy val ijp_debayer2sx_core = project.in(file("ijp-debayer2sx-core"))
     name := "ijp-debayer2sx-core",
     description := "IJP DeBayer2SX Core",
     commonSettings,
+    libraryDependencies += "io.github.metarank" %% "cfor" % "0.3",
     libraryDependencies ++= {
       if (isScala2(scalaVersion.value)) {
         Seq(
-          "com.beachape" %% "enumeratum" % "1.7.0",
-          "io.github.metarank" %% "cfor" % "0.2"
+          "com.beachape" %% "enumeratum" % "1.7.2"
         )
       } else {
         Seq.empty[ModuleID]

ijp-debayer2sx-core/src/main/scala-3/ij_plugins/debayer2sx/DeBayer2Config.scala

@@ -1,6 +1,6 @@
 /*
  * Image/J Plugins
- * Copyright (C) 2002-2021 Jarek Sacha
+ * Copyright (C) 2002-2023 Jarek Sacha
  * Author's email: jpsacha at gmail [dot] com
  *
  * This library is free software; you can redistribute it and/or
@@ -30,12 +30,12 @@ object DeBayer2Config {
    * Debayer algorithm type.
    */
   enum Demosaicing(val entryName: String) {
-    case Replication extends Demosaicing("Replication")
-    case Bilinear extends Demosaicing("Bilinear")
-    case SmoothHue extends Demosaicing("Smooth Hue")
+    case Replication       extends Demosaicing("Replication")
+    case Bilinear          extends Demosaicing("Bilinear")
+    case SmoothHue         extends Demosaicing("Smooth Hue")
     case AdaptiveSmoothHue extends Demosaicing("Adaptive Smooth Hue")
-    case DDFAPD extends Demosaicing("DDFAPD without Refining")
-    case DDFAPDRefined extends Demosaicing("DDFAPD with Refining")
+    case DDFAPD            extends Demosaicing("DDFAPD without Refining")
+    case DDFAPDRefined     extends Demosaicing("DDFAPD with Refining")
 
     override def toString: String = entryName
     def name: String              = entryName
@@ -53,11 +53,13 @@ object DeBayer2Config {
   /**
    * Order of filters in Bayer image.
    * For instance B-G means that the first pixel in the first row is `B` the next one is `G`.
+   *
+   * The `bayer1ID` is the flag used by the Bayer1 algorithms, see [[ij_plugins.debayer2sx.Debayer1#replicate_decode]].
    */
   enum MosaicOrder(val entryName: String, val bayer1ID: Int) {
     case B_G extends MosaicOrder("B-G", 1)
-    case G_B extends MosaicOrder("G-B", 3)
-    case G_R extends MosaicOrder("G-R", 2)
+    case G_B extends MosaicOrder("G-B", 2)
+    case G_R extends MosaicOrder("G-R", 3)
     case R_G extends MosaicOrder("R-G", 0)
 
     override def toString: String = entryName

ijp-debayer2sx-core/src/main/scala-2/ij_plugins/debayer2sx/LoopUtils.scala → ijp-debayer2sx-core/src/main/scala/ij_plugins/debayer2sx/LoopUtils.scala

@@ -1,6 +1,6 @@
 /*
  * Image/J Plugins
- * Copyright (C) 2002-2021 Jarek Sacha
+ * Copyright (C) 2002-2023 Jarek Sacha
  * Author's email: jpsacha at gmail [dot] com
  *
  * This library is free software; you can redistribute it and/or

project/build.properties

@@ -1,6 +1,6 @@
 #
 # Image/J Plugins
-# Copyright (C) 2002-2021 Jarek Sacha
+# Copyright (C) 2002-2023 Jarek Sacha
 # Author's email: jpsacha at gmail [dot] com
 #
 # This library is free software; you can redistribute it and/or
@@ -19,4 +19,4 @@
 #
 # Latest release available at https://github.com/ij-plugins/ijp-DeBayer2SX
 #
-sbt.version=1.7.1
+sbt.version=1.8.2

project/sbt-sonatype.sbt

@@ -2,5 +2,5 @@
 //
 // [https://github.com/xerial/sbt-sonatype]
 //
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13")
-addSbtPlugin("com.github.sbt"   % "sbt-pgp"    % "2.1.2")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15")
+addSbtPlugin("com.github.sbt" % "sbt-pgp"      % "2.2.1")