fix fatal error(import problem)

DYGV · Feb 5, 2020 · 7677f7b · 7677f7b
1 parent 1310a67
commit 7677f7b
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 19 deletions.
diff --git a/png_img/encoded_lena_1.png b/png_img/encoded_lena_1.png
diff --git a/source/app.d b/source/app.d
@@ -1,6 +1,5 @@
 import img4d;
-import std.stdio, std.datetime.systime,img4d_lib.filter, img4d_lib.encode;
-
+import std.stdio, std.datetime.systime, img4d.img4d_lib.filter, img4d.img4d_lib.encode;
 mixin bitOperator;
 mixin makeChunk;
 

diff --git a/source/img4d/img4d.d b/source/img4d/img4d.d
@@ -1,10 +1,9 @@
 module img4d.img4d;
 
-import img4d_lib.decode, img4d_lib.encode, img4d_lib.filter, img4d_lib.color_space, img4d_lib.edge,
-    img4d_lib.template_matching, img4d_lib.quality_evaluation, img4d_lib.threshold;
+import img4d.img4d_lib.decode, img4d.img4d_lib.encode, img4d.img4d_lib.filter, img4d.img4d_lib.color_space, img4d.img4d_lib.edge, img4d.img4d_lib.template_matching, img4d.img4d_lib.quality_evaluation, img4d.img4d_lib.threshold;
 
 import std.stdio, std.array, std.bitmanip, std.conv, std.algorithm, std.range, std.file : exists;
-import img4d_lib.fourier;
+import img4d.img4d_lib.fourier;
 import std.complex;
 import std.math;
 

diff --git a/source/img4d/img4d_lib/color_space.d b/source/img4d/img4d_lib/color_space.d
@@ -1,4 +1,4 @@
-module img4d_lib.color_space;
+module img4d.img4d_lib.color_space;
 
 import img4d, std.stdio, std.array, std.conv, std.algorithm, std.range;
 

diff --git a/source/img4d/img4d_lib/decode.d b/source/img4d/img4d_lib/decode.d
@@ -1,10 +1,10 @@
-module img4d_lib.decode;
+module img4d.img4d_lib.decode;
 
-import img4d, img4d_lib.filter;
+import img4d, img4d.img4d_lib.filter;
 import std.file : read;
 import std.digest.crc : CRC32, crc32Of;
 import std.stdio, std.array, std.bitmanip, std.zlib, std.conv, std.algorithm,
-    std.range, img4d_lib.encode;
+    std.range, img4d.img4d_lib.encode;
 
 class Decode
 {

diff --git a/source/img4d/img4d_lib/edge.d b/source/img4d/img4d_lib/edge.d
@@ -1,4 +1,4 @@
-module img4d_lib.edge;
+module img4d.img4d_lib.edge;
 
 import std.stdio, std.array, std.conv, std.algorithm, std.range, std.math;
 import std.range.primitives;

diff --git a/source/img4d/img4d_lib/encode.d b/source/img4d/img4d_lib/encode.d
@@ -1,6 +1,6 @@
-module img4d_lib.encode;
+module img4d.img4d_lib.encode;
 
-import img4d, img4d_lib.decode, img4d_lib.filter;
+import img4d, img4d.img4d_lib.decode, img4d.img4d_lib.filter;
 import std.stdio, std.array, std.bitmanip, std.conv, std.zlib, std.digest,
     std.digest.crc, std.range, std.algorithm;
 import std.parallelism : parallel;

diff --git a/source/img4d/img4d_lib/filter.d b/source/img4d/img4d_lib/filter.d
@@ -1,4 +1,4 @@
-module img4d_lib.filter;
+module img4d.img4d_lib.filter;
 
 import std.stdio, std.array, std.conv, std.algorithm, std.range;
 import std.parallelism : parallel;

diff --git a/source/img4d/img4d_lib/fourier.d b/source/img4d/img4d_lib/fourier.d
@@ -1,4 +1,4 @@
-module img4d_lib.fourier;
+module img4d.img4d_lib.fourier;
 
 import img4d;
 import std.stdio, std.array, std.conv, std.range, std.algorithm, std.math, std.complex;

diff --git a/source/img4d/img4d_lib/package.d b/source/img4d/img4d_lib/package.d
@@ -0,0 +1,12 @@
+module img4d.img4d_lib;
+
+public{
+	import img4d.img4d_lib.decode;
+	import img4d.img4d_lib.encode;
+	import img4d.img4d_lib.filter;
+	import img4d.img4d_lib.color_space;
+	import img4d.img4d_lib.edge;
+	import img4d.img4d_lib.template_matching;
+	import img4d.img4d_lib.quality_evaluation;
+	import img4d.img4d_lib.threshold;
+}
diff --git a/source/img4d/img4d_lib/quality_evaluation.d b/source/img4d/img4d_lib/quality_evaluation.d
@@ -1,4 +1,4 @@
-module img4d_lib.quality_evaluation;
+module img4d.img4d_lib.quality_evaluation;
 import std.stdio, std.math;
 import img4d;
 

diff --git a/source/img4d/img4d_lib/template_matching.d b/source/img4d/img4d_lib/template_matching.d
@@ -1,4 +1,4 @@
-module img4d_lib.template_matching;
+module img4d.img4d_lib.template_matching;
 
 import img4d;
 import std.stdio, std.array, std.math,std.algorithm.iteration;

diff --git a/source/img4d/img4d_lib/threshold.d b/source/img4d/img4d_lib/threshold.d
@@ -1,4 +1,4 @@
-module img4d_lib.threshold;
+module img4d.img4d_lib.threshold;
 import img4d;
 
 class Threshold

diff --git a/source/test.d b/source/test.d
@@ -1,6 +1,6 @@
 import img4d;
-import img4d_lib.decode, img4d_lib.encode, img4d_lib.filter,
-    img4d_lib.color_space, img4d_lib.edge;
+import img4d.img4d_lib.decode, img4d.img4d_lib.encode, img4d.img4d_lib.filter,
+    img4d.img4d_lib.color_space, img4d.img4d_lib.edge;
 
 import std.stdio, std.array, std.bitmanip, std.conv, std.algorithm, std.range,
     std.math, std.string, std.range.primitives, std.algorithm.mutation,