Fixed #3

modified: src/main/java/me/ww23/image/BlindWatermark.java Changes to be committed: modified: src/main/java/me/ww23/image/BlindWatermark.java
ww23 · Nov 29, 2018 · 5f806c7 · 5f806c7
1 parent 8301044
commit 5f806c7
Showing 1 changed file with 31 additions and 11 deletions.
diff --git a/src/main/java/me/ww23/image/BlindWatermark.java b/src/main/java/me/ww23/image/BlindWatermark.java
@@ -1,5 +1,8 @@
 package me.ww23.image;
 
+import org.bytedeco.javacv.CanvasFrame;
+import org.bytedeco.javacv.OpenCVFrameConverter;
+
 import static org.bytedeco.javacpp.opencv_core.*;
 import static org.bytedeco.javacpp.opencv_imgcodecs.*;
 import static org.bytedeco.javacpp.opencv_imgproc.*;
@@ -52,8 +55,16 @@ public static void main(String[] args) {
                help();
        }
 
-//         encode("gakki.png", "mywife", "gakki-wm-text.jpg", true);
-//         decode("gakki-wm-text.jpg", "gakki-text-dc.jpg");
+//        Mat srcImg = imread("gakki.png", CV_RGB2GRAY);
+/*
+        srcImg.convertTo(srcImg, CV_32F);
+
+        Mat result = new Mat(srcImg.size(), srcImg.type());
+        dct(srcImg, result);*/
+//        showMat(srcImg);
+
+//        encode("gakki.png", "wm.png", "gakki-test.png", false);
+//        decode("gakki.png", "gakki-test.png", "test.png");
     }
 
     /**
@@ -82,7 +93,6 @@ private static void encode(String image, String watermark, String output, Boolea
 
         MatVector[] planes = {new MatVector(2), new MatVector(2), new MatVector(2)};
         for (int i = 0; i < color.size(); i++) {
-            color.get(i).convertTo(color.get(i), CV_32F);
             Mat comImg = startDFT(color.get(i));
             if (option) {
                 addTextWaterMark(comImg, watermark);
@@ -106,12 +116,11 @@ private static void encode(String image, String watermark, String output, Boolea
      * @param output 图像中文本水印
      */
     private static void decode(String wmImg, String output) {
-
         Mat decImg = imread(wmImg, CV_LOAD_IMAGE_GRAYSCALE);
+
         if (decImg.empty()) {
             System.exit(1);
         }
-        decImg.convertTo(decImg, CV_32F);
 
         decImg = startDFT(decImg);
         MatVector newPlanes = new MatVector(2);
@@ -130,22 +139,23 @@ private static void decode(String wmImg, String output) {
     /**
      * 图片水印解码
      *
-     * @param srcImg 原图
+     * @param srcImg 原图(没有加水印)
      * @param wmImg  加了图片水印的图像
      * @param output 图像中的水印
      */
     private static void decode(String srcImg, String wmImg, String output) {
-        Mat decImg = imread(srcImg, CV_LOAD_IMAGE_GRAYSCALE);
+        Mat src = imread(srcImg, CV_LOAD_IMAGE_GRAYSCALE);
         Mat wm = imread(wmImg, CV_LOAD_IMAGE_GRAYSCALE);
 
-        decImg.convertTo(decImg, CV_32F);
-        wm.convertTo(wm, CV_32F);
-        if (decImg.empty() || wm.empty()) {
+        if (src.empty() || wm.empty()) {
             System.exit(1);
         }
 
+        startDFT(src).convertTo(src, CV_32F);
+        startDFT(wm).convertTo(wm, CV_32F);
+
         //srcImg - wmImg
-        subtract(wm, startDFT(decImg), startDFT(wm));
+        subtract(wm, src, wm);
 
         MatVector newPlanes = new MatVector(2);
         split(wm, newPlanes);
@@ -161,6 +171,7 @@ private static void decode(String srcImg, String wmImg, String output) {
      * @return 转化后的图像
      */
     private static Mat startDFT(Mat srcImg) {
+        srcImg.convertTo(srcImg, CV_32F);
         MatVector planes = new MatVector(2);
         Mat comImg = new Mat();
         planes.put(0, srcImg);
@@ -264,6 +275,15 @@ private static void createWaterMark(Mat comImg, Mat wm) {
         vconcat(combine, wm);
     }
 
+    /**
+     * 显示 Mat
+     * @param matrix 要显示的 Mat
+     */
+    private static void showMat(Mat matrix) {
+        CanvasFrame canvas = new CanvasFrame(matrix.toString());
+        canvas.showImage(new OpenCVFrameConverter.ToMat().convert(matrix));
+    }
+
     private static void help() {
         System.out.println("Usage: java -jar InvisibleWatermark.jar <commands> [args...] \n" +
                 "   commands: \n" +