refactor: move image to standard distrib

build.sbt

@@ -1254,6 +1254,7 @@ lazy val `std-bits` = project
     libraryDependencies ++= Seq(
       "com.ibm.icu"    % "icu4j"             % icuVersion,
       "com.univocity"  % "univocity-parsers" % "2.9.0",
+      "org.openpnp"    % "opencv"            % "4.5.1-0",
       "org.xerial"     % "sqlite-jdbc"       % "3.34.0",
       "org.postgresql" % "postgresql"        % "42.2.19"
     ),

distribution/std-lib/Image/src/Codecs.enso → distribution/std-lib/Standard/src/Image/Codecs.enso

@@ -1,7 +1,7 @@
-from Base import all
-import Base.System.File
-import Image.Data.Matrix
-import Image.Codecs.Internal
+from Standard.Base import all
+import Standard.Base.System.File
+import Standard.Image.Data.Matrix
+import Standard.Image.Codecs.Internal
 
 polyglot java import org.enso.image.Image as Java_Image
 

distribution/std-lib/Image/src/Codecs/Internal.enso → distribution/std-lib/Standard/src/Image/Codecs/Internal.enso

@@ -1,5 +1,5 @@
-from Base import all
-import Image.Codecs
+from Standard.Base import all
+import Standard.Image.Codecs
 
 polyglot java import org.opencv.core.MatOfInt
 polyglot java import org.opencv.imgcodecs.Imgcodecs

distribution/std-lib/Image/src/Data/Histogram.enso → distribution/std-lib/Standard/src/Image/Data/Histogram.enso

@@ -1,5 +1,5 @@
-from Base import all
-import Image.Data.Histogram.Internal
+from Standard.Base import all
+import Standard.Image.Data.Histogram.Internal
 
 polyglot java import org.enso.image.data.Histogram as Java_Histogram
 

distribution/std-lib/Image/src/Data/Histogram/Internal.enso → distribution/std-lib/Standard/src/Image/Data/Histogram/Internal.enso

@@ -1,5 +1,5 @@
-from Base import all
-import Image.Data.Histogram
+from Standard.Base import all
+import Standard.Image.Data.Histogram
 
 from_java hist =
     Histogram.Histogram hist.get_channels (Vector.Vector hist.get_data)

distribution/std-lib/Image/src/Data/Matrix.enso → distribution/std-lib/Standard/src/Image/Data/Matrix.enso

@@ -1,5 +1,5 @@
-from Base import all
-import Image.Data.Matrix.Internal
+from Standard.Base import all
+import Standard.Image.Data.Matrix.Internal
 
 polyglot java import org.enso.image.data.Matrix as Java_Matrix
 

distribution/std-lib/Image/src/Data/Matrix/Internal.enso → distribution/std-lib/Standard/src/Image/Data/Matrix/Internal.enso

@@ -1,5 +1,5 @@
-from Base import all
-import Image.Data.Matrix
+from Standard.Base import all
+import Standard.Image.Data.Matrix
 
 polyglot java import org.enso.image.data.Matrix as Java_Matrix
 polyglot java import org.opencv.core.Mat

image/src/main/java/org/enso/image/Algorithm.java → std-bits/src/main/java/org/enso/image/Algorithm.java

@@ -1,6 +1,6 @@
 package org.enso.image;
 
-import org.enso.opencv.OpenCV;
+import org.enso.image.opencv.OpenCV;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.imgcodecs.Imgcodecs;

image/src/main/java/org/enso/image/Image.java → std-bits/src/main/java/org/enso/image/Image.java

@@ -1,6 +1,6 @@
 package org.enso.image;
 
-import org.enso.opencv.OpenCV;
+import org.enso.image.opencv.OpenCV;
 import org.opencv.core.Core;
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;

image/src/main/java/org/enso/image/data/Matrix.java → std-bits/src/main/java/org/enso/image/data/Matrix.java

@@ -1,6 +1,6 @@
 package org.enso.image.data;
 
-import org.enso.opencv.OpenCV;
+import org.enso.image.opencv.OpenCV;
 import org.opencv.core.*;
 import org.opencv.imgcodecs.Imgcodecs;
 

image/src/main/java/org/enso/opencv/OpenCV.java → std-bits/src/main/java/org/enso/image/opencv/OpenCV.java

@@ -1,6 +1,6 @@
 // Copied from https://github.com/openpnp/opencv/blob/v4.5.1-0/src/main/java/nu/pattern/OpenCV.java
 // to allow library loading on GraalVM.
-package org.enso.opencv;
+package org.enso.image.opencv;
 
 import org.opencv.core.Core;
 

test/Image_Tests/src/Codecs_Spec.enso

@@ -1,9 +1,9 @@
-from Base import all
-import Base.System.Process
-import Base.System.Process.Exit_Code
-import Test
+from Standard.Base import all
+import Standard.Base.System.Process
+import Standard.Base.System.Process.Exit_Code
+import Standard.Test
 
-import Image.Codecs
+import Standard.Image.Codecs
 
 polyglot java import java.lang.System as Java_System
 

test/Image_Tests/src/Data/Matrix_Spec.enso

@@ -1,6 +1,6 @@
-from Base import all
-import Image.Data.Matrix
-import Test
+from Standard.Base import all
+import Standard.Test
+import Standard.Image.Data.Matrix
 
 polyglot java import org.enso.image.data.Matrix as Java_Matrix
 

test/Image_Tests/src/Main.enso

@@ -1,5 +1,5 @@
-from Base import all
-import Test
+from Standard.Base import all
+import Standard.Test
 
 import Image_Tests.Codecs_Spec
 import Image_Tests.Data.Matrix_Spec