* of the GNU General Public License.
*/
-#include "lib/lib.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
-#include "lib/base64.h"
+#include "ucw/lib.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
+#include "ucw/base64.h"
+#include "ucw/base224.h"
#include "images/images.h"
#include "images/color.h"
#include "images/signature.h"
-g --background background color (hexadecimal RRGGBB)\n\
-r --segmentation-1 writes image1 segmentation to given file\n\
-R --segmentation-2 writes image2 segmentation to given file\n\
--6 --base64 display base64 encoded signature\n\
+-6 --base64 display base64 encoded signature(s)\n\
+-2 --base224 display base224 encoded signature(s)\n\
", stderr);
exit(1);
}
-static char *shortopts = "qf:F:g:t:r:R:6" CF_SHORT_OPTS;
+static char *shortopts = "qf:F:g:t:r:R:62" CF_SHORT_OPTS;
static struct option longopts[] =
{
CF_LONG_OPTS
{ "segmentation-1", 0, 0, 'r' },
{ "segmentation-2", 0, 0, 'R' },
{ "base64", 0, 0, '6' },
+ { "base224", 0, 0, '2' },
{ NULL, 0, 0, 0 }
};
static byte *segmentation_name_1;
static byte *segmentation_name_2;
static uns display_base64;
+static uns display_base224;
-#define MSG(x...) do{ if (verbose) log(L_INFO, ##x); }while(0)
+#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0)
#define TRY(x) do{ if (!(x)) exit(1); }while(0)
static void
image_region_dump(buf, sig->reg + i);
MSG("region %u: %s", i, buf);
}
+ uns sig_size = image_signature_size(sig->len);
if (display_base64)
{
- uns sig_size = image_signature_size(sig->len);
byte buf[BASE64_ENC_LENGTH(sig_size) + 1];
uns enc_size = base64_encode(buf, (byte *)sig, sig_size);
buf[enc_size] = 0;
MSG("base64 encoded: %s", buf);
}
+ if (display_base224)
+ {
+ byte buf[BASE224_ENC_LENGTH(sig_size) + 1];
+ uns enc_size = base224_encode(buf, (byte *)sig, sig_size);
+ buf[enc_size] = 0;
+ MSG("base224 encoded: %s", buf);
+ }
}
static struct image_context ctx;
write_segmentation(struct image_sig_data *data, byte *fn)
{
MSG("Writing segmentation to %s", fn);
-
+
struct fastbuf *fb = bopen(fn, O_WRONLY | O_CREAT | O_TRUNC, 4096);
struct image *img;
TRY(img = image_new(&ctx, data->image->cols, data->image->rows, COLOR_SPACE_RGB, NULL));
luv[2] = ((int)data->regions[i].a[2] - 128) * (4 / 2.55);
luv_to_xyz_exact(xyz, luv);
xyz_to_srgb_exact(srgb, xyz);
- c[0] = CLAMP(srgb[0] * 255, 0, 255);
- c[1] = CLAMP(srgb[1] * 255, 0, 255);
- c[2] = CLAMP(srgb[2] * 255, 0, 255);
+ c[0] = CLAMP(srgb[0] * 255, 0, 255);
+ c[1] = CLAMP(srgb[1] * 255, 0, 255);
+ c[2] = CLAMP(srgb[2] * 255, 0, 255);
for (struct image_sig_block *block = data->regions[i].blocks; block; block = block->next)
{
uns x1 = block->x * 4;
io.fastbuf = fb;
io.image = img;
- io.format = image_file_name_to_format(fn);
+ io.format = image_file_name_to_format(fn);
TRY(image_io_write(&io));
image_io_reset(&io);
case '6':
display_base64++;
break;
+ case '2':
+ display_base224++;
+ break;
default:
usage();
}