xan/cammy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed a few things, changed a color index, kinda dull eh

Browse source
This commit is contained in:
XANTRONIX Development 2016-06-08 18:54:08 -05:00
parent 6a5fc83ede
commit d35675ce56
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bin/main.c
View file

@ -37,8 +37,8 @@ static void usage(int argc, char **argv, const char *message, ...) {
fprintf(stderr, "usage: %1$s import file.sav 1..30 input.png\n"
" %1$s export file.sav 1..30 output.png\n"
" %1$s dither input.png output.png\n"
" %1$s split file.sav rn gn bn input.png\n"
" %1$s merge file.sav rn gn bn output.png\n"
" %1$s split-rgb file.sav rn gn bn input.png\n"
" %1$s merge-rgb file.sav rn gn bn output.png\n"
" %1$s import-tile file.sav 1..30 printer.tile\n"
" %1$s export-tile file.sav 1..30 output.tile\n"
" %1$s convert-tile printer.tile output.png\n",
@ -328,7 +328,7 @@ static void validate_photo_number(int argc, char **argv, int num) {
}
}
static int split(int argc, char **argv) {
static int split_rgb(int argc, char **argv) {
cammy_sram *sram;
png_t *png;
@ -429,7 +429,7 @@ error_sram_open:
return 1;
}
static int merge(int argc, char **argv) {
static int merge_rgb(int argc, char **argv) {
cammy_sram *sram;
png_t *png;
@ -742,8 +742,8 @@ static struct {
{ "import", import },
{ "export", export },
{ "dither", dither },
{ "split", split },
{ "merge", merge },
{ "split-rgb", split_rgb },
{ "merge-rgb", merge_rgb },
{ "import-tile", import_tile },
{ "export-tile", export_tile },
{ "convert-tile", convert_tile },

2
src/image.c
View file

@ -73,7 +73,7 @@ static uint32_t bayer_matrix[256] = {
};
static uint8_t level_2bpp_to_8bpp[4] = {
0, 85, 171, 255
0, 87, 171, 255
};
static uint8_t rgb_to_grayscale(uint8_t r, uint8_t g, uint8_t b) {