newpixbot online

[ott/enhance] / npb.c

diff --git a/npb.c b/npb.c
index 63bcb00e63edef224aa56312acc43cbcc6a7dab9..d315afff67ef46818672c100703685b0f4bb356d 100644 (file)
--- a/npb.c
+++ b/npb.c
@@ -1,7 +1,7 @@
 /*
 npb.c
 Take a picture and add a newpixbot to it!
-30.11.2022
+05.12.2022
 
 Copyright (C) 2013 - 2015, 2022  Balthasar Szczepański
 
@@ -122,7 +122,7 @@ int subtool_npb (int argc, char **argv, int argi, char **err)
                {"help",           no_argument,       NULL, 'h'},
                {0,                0,                 0,    0}
        };
-       char short_options[] = "o4r:b:e:ch";
+       char short_options[] = "o4r:b:e:ch0";
        
        int opt;
        int r;
@@ -227,6 +227,7 @@ int subtool_npb (int argc, char **argv, int argi, char **err)
                space_t = NPB0_T;
                space_b = NPB0_B;
                fill_white = 1;
+               override_new_border = 1;
                new_border = 0;
                npb_after = 1;
                fixed_frame = 1;
@@ -240,6 +241,7 @@ int subtool_npb (int argc, char **argv, int argi, char **err)
                space_t = NPB1_T;
                space_b = NPB1_B;
                fill_white = 1;
+               override_new_border = 1;
                new_border = 0;
                npb_after = 1;
                fixed_frame = 1;
@@ -568,8 +570,8 @@ int subtool_npb (int argc, char **argv, int argi, char **err)
                
                r = perform_action_1picture(
                        2, //id
-                       fixed_frame ? space_l : x0_content_global, //x0
-                       fixed_frame ? space_t : y0_content_global, //y0
+                       fixed_frame ? space_l + external_border : x0_content_global, //x0
+                       fixed_frame ? space_t + external_border: y0_content_global, //y0
                        0, //f0
                        fixed_frame ? (space_r - space_l + 1) : width_content, //width
                        fixed_frame ? (space_b - space_t + 1) : height_content, //height