1.9.4 fix de-nearest

Author: tumuyan

RealSR-NCNN-Android-CLI/Resize/src/main/jni/main.cpp

@@ -548,22 +548,21 @@ int main(int argc, char **argv)
                 } else {
                     not_use_ncnn = false;
                     if (abs(scale_y - scale_x) < 1)
-                        scale_d = round((scale_x + scale_y) / 2);
+                        scale = round((scale_x + scale_y) / 2);
                     else if (scale_x > scale_y)
-                        scale_d = round(scale_y);
+                        scale = round(scale_y);
                     else
-                        scale_d = round(scale_x);
+                        scale = round(scale_x);
 
-                    fprintf(stderr, "image might be interpolated by nearest x%.0f\n", scale_d);
                     scale_d = 1 / scale_d;
+                    fprintf(stderr, "image might be interpolated by nearest x%d\n", scale);
                 }
             }
         }
 
 
         int out_w, out_h;
-        if (scale != scale_d || !not_use_ncnn) {
-//            fprintf(stderr, "reset scale\n");
+        if ( scale_d<1 ) {
             out_w = (int) (w * scale_d);
             out_h = (int) (h * scale_d);
         } else {
@@ -629,13 +628,12 @@ int main(int argc, char **argv)
                         }
                     }
                 } else {
-
+                    if(scale_d>=1)
                     {
                         int p = 0;
                         int q = 0;
                         //row
                         for (int i = 0; i < h; i++) {
-
                             //line
                             void *l = buf + q;
                             for (int j = 0; j < w; j++) {
@@ -645,36 +643,25 @@ int main(int argc, char **argv)
                                     memcpy(buf + q, pixeldata + p, sizeof(unsigned char) * c);
                                     q += c;
                                 }
-
-                                if (verbose) {
-                                    fprintf(stderr, "i:%d j:%d :", i, j);
-                                    for (int i = 0; i < 32; i++) {
-                                        fprintf(stderr, " %02X", buf[i]
-                                        );
-                                    }
-                                    fprintf(stderr, " ,m=%d %d\n", p, q);
-                                }
-
                                 p += c;
                             }
-
-
-
                             // mult-line
                             for (int k = 1; k < scale; k++) {
                                 memcpy(buf + q, l, sizeof(unsigned char) * out_line_size);
                                 q += out_line_size;
                             }
-
-
-                            /*
-                             * print
-                                w++;
-                                if(w==100){
-                                    w=0;
-                                    fprintf(stderr, "%.2f%%\n", (i+1)*1e2/h);
-                                }
-                             */
+                        }
+                    }else{
+                        // de-nearest
+                        int p=(scale-1)/2, q=0;
+                        double step = 1/scale_d;
+                        // row
+                        for(int i=0;i<out_h;i++){
+                            for(int j=0;j<out_w;j++){
+                                memcpy(buf + q, pixeldata + p+j*scale, sizeof(unsigned char) * c);
+                                q+=c;
+                            }
+                            p+=w*c;
                         }
                     }
                 }
@@ -861,7 +848,7 @@ int main(int argc, char **argv)
                         success = false;
                     } else {
                         success = imwrite(outputpath.c_str(), image);
-                        fprintf(stderr, "opencv save image success, c=%d, w=%d, h=%d\n", c, w, h);
+                        fprintf(stderr, "opencv save image success, c=%d, w=%d, h=%d\n", c, out_w, out_h);
                     }
                 }else
 #endif

RealSR-NCNN-Android-GUI/app/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "com.tumuyan.ncnn.realsr"
         minSdk 24
         targetSdk 28
-        versionCode 38
-        versionName '1.9.3'
+        versionCode 39
+        versionName '1.9.4'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

RealSR-NCNN-Android-GUI/app/src/main/res/values-zh/strings.xml

@@ -45,12 +45,18 @@
         \n算法包含但不限于不限于Box Cubic Hamming Jinc Lanczos Lagrange Mitchell Sinc，可以通过命令./magick -list filter查看支持的全部算法。也可以参阅说明 https://legacy.imagemagick.org/Usage/filter
         \nImageMagick的功能非常强大，示例命令仅仅是缩放图片的调用。
 
-        \n\n四、显示指定信息
+        \n\n四、Anime4K
+        \n本应用内置了Anime4KCPP https://github.com/TianZerL/Anime4KCPP
+        \n这个项目包含了Anime4K 0.9 算法（也就是说并非最新版）以及 ACNet （一个基于卷积神经网络的超分辨率算法）
+        \n它所支持的参数详见说明 https://github.com/TianZerL/Anime4KCPP/wiki/CLI
+
+        \n\n五、显示指定信息
         \n in 显示输入的图像
         \n out 显示输出的图像
         \n show （跟随图像的路径作为参数）显示指定路径的图像
         \n help 显示帮助信息
-        \n\n五、调用shell命令
+
+        \n\n六、调用shell命令
         \n 如ls head cp rm等等
         </string>
     <string name="input_command">输入shell命令,如 ./realsr-ncnn -i input.png -o output.png</string>

RealSR-NCNN-Android-GUI/app/src/main/res/values/strings.xml

@@ -26,13 +26,17 @@
         \n./magick input.png -filter filter -resize n% output.png
         \nfilter could be Box Cubic Hamming Jinc Lanczos Lagrange Mitchell Sinc, etc，intpu ./magick -list filter and see more filter, or visit https://legacy.imagemagick.org/Usage/filter
 
+        \n\n4、Anime4K https://github.com/TianZerL/Anime4KCPP
+        \nIt contains Anime4K 0.9 (not the latest) and ACNet.
+        \nPlease visit the wiki to get more information. https://github.com/TianZerL/Anime4KCPP/wiki/CLI
 
-        \n\n4.Show image/info
+        \n\n5.Show image/info
         \n in
         \n out
         \n show
         \n help
-        \n\n5.Shell command
+
+        \n\n6.Shell command
         \nls head cp rm etc.
      \n\n
         Tips.