margen v1.2.6

* feat: Github CI

* add verbose to gcc

* reorder jobs

* add extra warnings and small fix

.github/workflows/ci.yml

@@ -0,0 +1,48 @@
+name: C-lang CI
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+env:
+  GCC_ARGS: src/*.c src/*.h -Ofast
+  TARGET: margen
+  TEST_ARGS: ""
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: gcc
+        run: gcc -v -Wall -Wextra -Werror $GCC_ARGS
+
+  build-release:
+    needs: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: aclocal
+        run: aclocal
+      - name: autoconf
+        run: autoconf
+      - name: automake
+        run: automake --add-missing
+      - name: configure
+        run: ./configure
+      - name: make
+        run: make
+      - name: make distcheck
+        run: make distcheck
+
+  run:
+    needs: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: gcc
+        run: mkdir -p build && gcc $GCC_ARGS -o build/$TARGET
+      - name: run program
+        run: ./build/$TARGET $TEST_ARGS

.gitignore

@@ -2,3 +2,26 @@ build
 .vscode
 *.bmp
 !images/*
+*.cache
+.deps
+Makefile
+*.log
+*.o
+*.h.gch
+*.out
+.dirstamp
+aclocal.m4
+compile
+install-sh
+missing
+depcomp
+Makefile.in
+configure~
+config.status
+margen
+*.tar.gz
+configure
+src/margen*
+*.pkg.tar.zst
+pkg
+margen-*

Makefile

@@ -1,24 +0,0 @@
-TARGET ?= margen
-INSTALL_DIR ?= $(HOME)/.local/bin
-TEST_ARGS ?=
-SHELL := /bin/bash
-
-.PHONY: build
-clean:
-	@rm -rf build
-
-build:
-	@mkdir -p build
-	gcc -Wall src/*.c src/*.h -lm -o build/$(TARGET)
-
-.PHONY: install
-install: build
-	cp -f build/$(TARGET) $(INSTALL_DIR)/$(TARGET)
-
-.PHONY: time
-time: build
-	time ./build/$(TARGET) $(TEST_ARGS)
-
-.PHONY: valgrind
-valgrind: build
-	valgrind --leak-check=full -s ./build/$(TARGET) $(TEST_ARGS)

Makefile.am

@@ -0,0 +1,5 @@
+AUTOMAKE_OPTIONS = foreign subdir-objects -Wall
+bin_PROGRAMS = margen
+margen_SOURCES = src/main.c src/args.c src/bmp.c src/generator.c src/rand.c
+margen_CFLAGS = -Ofast -march=native -flto -funroll-loops -fprefetch-loop-arrays -fno-exceptions -fopenmp
+include_HEADERS = src/main.h src/args.h src/bmp.h src/generator.h src/rand.h src/config.h src/types.h

Makefile.dev

@@ -0,0 +1,84 @@
+TARGET ?= margen
+INSTALL_DIR ?= $(HOME)/.local/bin
+TEST_ARGS ?=
+SHELL := /bin/bash
+
+.PHONY: build
+clean:
+	@rm -rf build
+
+build:
+	@mkdir -p build
+	gcc -Wall -Wextra -Og -g src/*.c src/*.h -o build/$(TARGET)
+
+.PHONY: install
+install: build
+	cp -f build/$(TARGET) $(INSTALL_DIR)/$(TARGET)
+
+.PHONY: time
+time: build
+	time ./build/$(TARGET) $(TEST_ARGS)
+
+.PHONY: valgrind
+valgrind: build
+	valgrind --leak-check=full -s ./build/$(TARGET) $(TEST_ARGS)
+
+.PHONY: release
+release: clean
+	aclocal
+	autoconf
+	automake --add-missing
+	./configure
+	make distcheck
+	mkdir -p build
+	cp $(TARGET)-*.tar.gz build
+	@rm -rf \
+		autom4te.cache \
+		aclocal.m4 \
+		compile \
+		config.* \
+		configure \
+		depcomp \
+		$(TARGET) \
+		$(TARGET)-*.tar.gz \
+		$(TARGET)-*.pkg.tar.zst \
+		install-sh \
+		Makefile \
+		Makefile.in \
+		missing \
+		src/.* \
+		src/*.o
+
+.PHONY: release
+release-clean:
+	@rm -rf \
+		autom4te.cache \
+		aclocal.m4 \
+		compile \
+		config.* \
+		configure \
+		depcomp \
+		$(TARGET) \
+		$(TARGET)-*.tar.gz \
+		$(TARGET)-*.pkg.tar.zst \
+		install-sh \
+		Makefile \
+		Makefile.in \
+		missing \
+		src/.* \
+		src/*.o
+
+.PHONY: release-arch
+release-arch: clean
+	mkdir -p build
+	cp PKGBUILD build
+	cd build && makepkg
+
+.PHONY: gif
+gif: build
+	mkdir -p tmp
+	for i in {1..50}; do \
+		./build/$(TARGET) -w=1920 -h=720 --seed=$$i$$i -o=tmp/image$$i.bmp ; \
+	done
+	ffmpeg -y -f image2 -framerate 1 -i tmp/image%d.bmp -vf scale=960x360 images/sample.gif
+	rm -rf tmp

PKGBUILD

@@ -0,0 +1,20 @@
+pkgname=margen
+pkgver=1.2.6
+pkgrel=1
+pkgdesc="Generate a marble-like pattern bitmap image, blazing fast."
+arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
+url="https://github.com/klemek/margen"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/klemek/margen/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('e35368e963dbc81e94c4fab50cf2aa5d0f56caf6079e204ca4608eb9835670bc')
+srcdir=build
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sudo make DESTDIR="$pkgdir" install
+}

README.md

@@ -1,45 +1,93 @@
+[![C-lang CI](https://github.com/klemek/margen/actions/workflows/ci.yml/badge.svg)](https://github.com/klemek/margen/actions/workflows/ci.yml)
+
 # margen
 
 > generate a marble-like pattern bitmap image, blazing fast.
 
-![](./images/sample1.bmp)
+<p align="center">
+  <img width="960" height="360" src="./images/sample.gif">
+</p>
 
 Written in pure C without librairies.
 
 ## Install
 
-You only need **gcc** and **make**.
+### From release
 
-```bash
+See [Releases](https://github.com/klemek/margen/releases)
+
+```sh
+tar xvzf margen-x.y.z.tar.gz
+cd margen-x.y.z
+./configure
+make
+make install
+```
+
+### From repository (PKGBUILD)
+
+```sh
 git clone https://github.com/klemek/margen
 cd margen
-make clean build install
+makepkg -si
-# margen is now installed in ~/.local/bin
+```
+
+
+### From repository (dev version)
+
+```sh
+git clone https://github.com/klemek/margen
+cd margen
+aclocal
+autoconf
+automake --add-missing
+./configure
+make
+make install
 ```
 
 ## CLI arguments
 
 ```txt
-usage: margen [--help] [-q] [-w=WIDTH] [-h=HEIGHT] [-o=PATH] [--seed=SEED][-p=PIXEL_SIZE] [-s=SLOPE] [-c=R,G,B] [-v=R,G,B] [-m]
+usage: margen [--help] [-v] [-q] [-w=WIDTH] [-h=HEIGHT] [-o=PATH] [--seed=SEED][-p=PIXEL_SIZE] [-s=SLOPE] [-c=R,G,B] [-va=R,G,B] [-vr=VAR_RANGE] [-r=ROTATION] [-m]
 
 generate a marble-like pattern bitmap image, blazing fast.
 
 options:
   --help             show this help message and exit
+  -v, --version      print version
   -q, --quiet        do not print to console
   -w, --width        image width (default: 1920)
   -h, --height       image height (default: 1080)
   -o, --output       output file (default: output.bmp)
-  -seed              random seed (default: time based)
+  --seed             random seed (default: time based)
   -p, --pixel        pixel size (default: random)
   -s, --slope        slope [0-255] (default: random)
   -c, --color        base color [0-255,0-255,0-255] (default: random)
-  -v, --variation    base variation [0-255,0-255,0-255] (default: random)
+  -va, --variation   fixed variation [0-255,0-255,0-255] (default: random)
-  -m, --monochrome   black & white generation
+  -vr, --var-range   random variation range [0-255] (default: 30)
+  -r, --rotation     start corner rotation [0-3] (default: random)
+  -m, --monochrome   grayscale generation
 ```
 
-## TODO
+## Release guide
 
-- monochrome
+```bash
-- select corner (currently bottom left)
+# get latest version
-- better starting parameters for convergeance
+git pull origin master
+# update configure.ac with new version
+$EDITOR configure.ac
+# make full build
+make -f Makefile.dev release
+# update PKGBUILD with new version and sha256 sum
+sha256sum build/margen-x.y.z.tar.gz
+$EDITOR PKGBUILD
+# push to repo
+git commit -am "margen vX.Y.Z"
+git tag vX.Y.Z
+git push origin master --tags
+# create release from tag on github
+# attach .tar.gz to the github release
+make -f Makefile.dev release-arch
+# attach .pkg.tar.zst to the github release
+```

configure.ac

@@ -0,0 +1,11 @@
+AC_INIT([margen], [1.2.6], [klemek.dev@proton.me])
+AM_INIT_AUTOMAKE
+AC_PROG_CC
+AC_CHECK_HEADERS([stdio.h])
+AC_CHECK_HEADERS([stdlib.h])
+AC_CHECK_HEADERS([stdbool.h])
+AC_CHECK_HEADERS([string.h])
+AC_CHECK_HEADERS([time.h])
+AC_CHECK_HEADERS([limits.h])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT

src/args.c

@@ -1,15 +1,19 @@
-#include "args.h"
+#include <limits.h>
-#include "const.h"
+#include <stdbool.h>
-#include "rand.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-void print_help(int status_code) {
+#include "args.h"
-  puts(NAME
+#include "config.h"
+#include "rand.h"
+#include "types.h"
+
+static void print_help(int status_code) {
+  puts(PACKAGE
        " " VERSION "\n\n"
-       "usage: " NAME " "
+       "usage: " PACKAGE " "
        "[--help] "
        "[-v] "
        "[-q] "
@@ -20,99 +24,105 @@ void print_help(int status_code) {
        "[-p=PIXEL_SIZE] "
        "[-s=SLOPE] "
        "[-c=R,G,B] "
-       "[--var=R,G,B] "
+       "[-va=R,G,B] "
-       "[-m]\n\n"
+       "[-vr=VAR_RANGE] "
+       "[-r=ROTATION] "
+       "[-m]"
+       "\n\n"
        "generate a marble-like pattern bitmap image, blazing fast.\n\n"
        "options:\n"
        "  --help             show this help message and exit\n"
+       "  -v, --version      print version\n"
        "  -q, --quiet        do not print to console\n"
        "  -w, --width        image width (default: 1920)\n"
        "  -h, --height       image height (default: 1080)\n"
        "  -o, --output       output file (default: output.bmp)\n"
-       "  -seed              random seed (default: time based)\n"
+       "  --seed             random seed (default: time based)\n"
        "  -p, --pixel        pixel size (default: random)\n"
        "  -s, --slope        slope [0-255] (default: random)\n"
        "  -c, --color        base color [0-255,0-255,0-255] (default: random)\n"
-       "  -v, --variation    base variation [0-255,0-255,0-255] (default: "
+       "  -va, --variation   fixed variation [0-255,0-255,0-255] (default: "
        "random)\n"
-       "  -m, --monochrome   black & white generation");
+       "  -vr, --var-range   random variation range [0-255] (default: 30)\n"
+       "  -r, --rotation    start corner rotation [0-3] (default: random)\n"
+       "  -m, --monochrome   grayscale generation\n");
   exit(status_code);
 }
 
-void invalid_arg(char *arg) {
+static void invalid_arg(char *arg) {
   fprintf(stderr, "invalid argument: '%s'\n\n", arg);
-  print_help(1);
+  print_help(EXIT_FAILURE);
 }
 
-void invalid_value(char *arg, char *value) {
+static void invalid_value(char *arg, char *value) {
   fprintf(stderr, "invalid value for argument '%s': '%s'\n\n", arg, value);
-  print_help(1);
+  print_help(EXIT_FAILURE);
 }
 
-bool is_arg(char *arg, char *ref) { return strcoll(arg, ref) == 0; }
+static bool is_arg(char *arg, char *ref) { return strcoll(arg, ref) == 0; }
 
-char *split_arg_value(char *arg) {
+static char *split_arg_value(char *arg) {
   strtok(arg, "=");
   return strtok(NULL, "=");
 }
 
-bool is_digit(char c) { return c >= '0' && c <= '9'; }
+static bool is_digit(char c) { return c >= '0' && c <= '9'; }
+
+static bool is_number(char *value) {
+  unsigned long value_len;
+  unsigned int i;
 
-bool is_number(char *value) {
   if (value == NULL) {
     return false;
   }
-  unsigned long value_len = strlen(value);
+  value_len = strlen(value);
-  int i;
   for (i = 0; i < value_len; i++) {
     if (!is_digit(value[i])) {
       return false;
     }
   }
+
   return true;
 }
 
-unsigned char parse_char(char *arg, char *value) {
+static unsigned int parse_uint(char *arg, char *value) {
+  unsigned long long tmp_value;
+
   if (!is_number(value)) {
     invalid_value(arg, value);
   }
-  unsigned long long tmp_value = (unsigned long long)atoll(value);
+  tmp_value = (unsigned long long)atoll(value);
-  if (tmp_value >= 256) {
+  if (tmp_value >= UINT_MAX) {
     invalid_value(arg, value);
   }
-  return (unsigned char)tmp_value;
+
+  return (unsigned int)tmp_value;
 }
 
-unsigned short parse_ushort(char *arg, char *value) {
+static unsigned long parse_ulong(char *arg, char *value) {
-  if (!is_number(value)) {
-    invalid_value(arg, value);
-  }
-  unsigned long long tmp_value = (unsigned long long)atoll(value);
-  if (tmp_value >= 65536) {
-    invalid_value(arg, value);
-  }
-  return (unsigned short)tmp_value;
-}
-
-unsigned short parse_ulong(char *arg, char *value) {
   if (!is_number(value)) {
     invalid_value(arg, value);
   }
   return (unsigned long)atoll(value);
 }
 
-void parse_color(char *arg, char *value, unsigned char color[3]) {
+static void parse_color(char *arg, char *value, unsigned int color[3]) {
   char *tmp;
+
   tmp = strtok(value, ",");
-  color[0] = parse_char(arg, tmp);
+  color[0] = parse_uint(arg, tmp);
   tmp = strtok(NULL, ",");
-  color[1] = parse_char(arg, tmp);
+  color[1] = parse_uint(arg, tmp);
   tmp = strtok(NULL, ",");
-  color[2] = parse_char(arg, tmp);
+  color[2] = parse_uint(arg, tmp);
 }
 
-parameters parse_args(int argc, char **argv) {
+Parameters args_parse(int argc, char **argv) {
-  parameters params;
+  Parameters params;
+  unsigned char var_range;
+  bool size_set, slope_set, start_set, var_set, rot_set;
+  int i;
+  char *arg, *value;
 
   params.quiet = false;
   params.seed = (unsigned long)time(NULL);
@@ -121,26 +131,26 @@ parameters parse_args(int argc, char **argv) {
   params.file_path = "output.bmp";
   params.monochrome = false;
 
-  bool size_set = false;
+  var_range = 30;
-  bool slope_set = false;
+
-  bool start_set = false;
+  size_set = false;
-  bool var_set = false;
+  slope_set = false;
+  start_set = false;
+  var_set = false;
+  rot_set = false;
 
-  int i;
-  char *arg;
-  char *value;
   for (i = 1; i < argc; i++) {
     arg = argv[i];
     value = split_arg_value(arg);
     if (is_arg(arg, "--help")) {
-      print_help(0);
+      print_help(EXIT_SUCCESS);
     } else if (is_arg(arg, "-q") || is_arg(arg, "--quiet")) {
       params.quiet = true;
     } else if (is_arg(arg, "-v") || is_arg(arg, "--version")) {
-      puts(NAME " " VERSION);
+      puts(PACKAGE " " VERSION);
       exit(0);
     } else if (is_arg(arg, "-w") || is_arg(arg, "--width")) {
-      params.width = parse_ushort(arg, value);
+      params.width = parse_uint(arg, value);
       if (params.width == 0) {
         invalid_value(arg, value);
       }
@@ -148,7 +158,7 @@ parameters parse_args(int argc, char **argv) {
         params.height = params.width;
       }
     } else if (is_arg(arg, "-h") || is_arg(arg, "--height")) {
-      params.height = parse_ushort(arg, value);
+      params.height = parse_uint(arg, value);
       if (params.height == 0) {
         invalid_value(arg, value);
       }
@@ -160,20 +170,25 @@ parameters parse_args(int argc, char **argv) {
     } else if (is_arg(arg, "-o") || is_arg(arg, "--output")) {
       params.file_path = value;
     } else if (is_arg(arg, "-p") || is_arg(arg, "--pixel")) {
-      params.size = parse_ushort(arg, value);
+      params.size = parse_uint(arg, value);
       if (params.size == 0) {
         invalid_value(arg, value);
       }
       size_set = true;
     } else if (is_arg(arg, "-s") || is_arg(arg, "--slope")) {
-      params.slope = parse_char(arg, value);
+      params.slope = parse_uint(arg, value);
       slope_set = true;
     } else if (is_arg(arg, "-c") || is_arg(arg, "--color")) {
       parse_color(arg, value, params.start);
       start_set = true;
-    } else if (is_arg(arg, "-v") || is_arg(arg, "--variation")) {
+    } else if (is_arg(arg, "-va") || is_arg(arg, "--variation")) {
       parse_color(arg, value, params.var);
       var_set = true;
+    } else if (is_arg(arg, "-vr") || is_arg(arg, "--var-range")) {
+      var_range = parse_uint(arg, value);
+    } else if (is_arg(arg, "-r") || is_arg(arg, "--rotation")) {
+      params.rotation = parse_uint(arg, value) % 4;
+      rot_set = true;
     } else if (is_arg(arg, "-m") || is_arg(arg, "--monochrome")) {
       params.monochrome = true;
     } else {
@@ -186,26 +201,30 @@ parameters parse_args(int argc, char **argv) {
     params.height = 1080;
   }
 
-  set_seed(params.seed);
+  rand_seed(params.seed);
 
   if (!size_set) {
-    params.size = rand_ushort(10) + 3;
+    params.size = rand_uint(6) + 6;
   }
 
   if (!slope_set) {
-    params.slope = rand_uchar(50) + 100;
+    params.slope = rand_uint(50) + 100;
   }
 
   if (!start_set) {
-    params.start[0] = rand_uchar(256);
+    params.start[0] = rand_uint(256);
-    params.start[1] = rand_uchar(256);
+    params.start[1] = rand_uint(256);
-    params.start[2] = rand_uchar(256);
+    params.start[2] = rand_uint(256);
   }
 
   if (!var_set) {
-    params.var[0] = rand_uchar(20);
+    params.var[0] = rand_uint(var_range + 1);
-    params.var[1] = rand_uchar(20);
+    params.var[1] = rand_uint(var_range + 1);
-    params.var[2] = rand_uchar(20);
+    params.var[2] = rand_uint(var_range + 1);
+  }
+
+  if (!rot_set) {
+    params.rotation = rand_uint(4);
   }
 
   return params;

src/args.h

@@ -3,6 +3,6 @@
 #ifndef ARGS_H
 #define ARGS_H
 
-parameters parse_args(int argc, char **argv);
+Parameters args_parse(int argc, char **argv);
 
 #endif

src/bmp.c

@@ -1,97 +1,125 @@
-#include "bmp.h"
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "bmp.h"
+#include "types.h"
+
 #define HEADER_SIZE 54
 
-void write_str(unsigned char *buffer, unsigned int offset, unsigned int size,
+static void write_str(unsigned char *buffer, unsigned int offset,
-               unsigned char *value) {
+                      unsigned int size, unsigned char *value) {
   unsigned int i;
+
   for (i = 0; i < size; i++) {
     buffer[offset + i] = (unsigned char)value[i];
   }
 }
 
-void write_num(unsigned char *buffer, unsigned int offset, unsigned int size,
+static void write_num(unsigned char *buffer, unsigned int offset,
-               unsigned int value) {
+                      unsigned int size, unsigned int value) {
   unsigned int i;
+
   for (i = 0; i < size; i++) {
     buffer[offset + i] = (unsigned char)((value >> (8 * i)) & 0xFFu);
   }
 }
 
-void write_nul(unsigned char *buffer, unsigned int offset, unsigned int size) {
+static void write_nul(unsigned char *buffer, unsigned int offset,
+                      unsigned int size) {
   unsigned int i;
+
   for (i = 0; i < size; i++) {
     buffer[offset + i] = 0;
   }
 }
 
-unsigned char *bmp_header(unsigned short width, unsigned short height,
+static unsigned char *bmp_header(unsigned int width, unsigned int height,
-                          unsigned char color_depth) {
+                                 unsigned int color_depth) {
-  unsigned char *output = (unsigned char *)malloc(HEADER_SIZE);
+  unsigned char *output;
-  unsigned int data_length = ((unsigned int)width) * ((unsigned int)height) *
+  unsigned int data_length;
-                             ((unsigned int)color_depth);
+
-  write_str(output, 0x00, 0x02, (unsigned char *)"BM"); // 0x00(2) BM
+  output = malloc(HEADER_SIZE * sizeof(unsigned char));
-  write_num(output, 0x02, 0x04,
+  data_length = width * height * color_depth;
-            HEADER_SIZE + data_length);       // 0x02(4) file size
+  // 0x00(2) BM
-  write_nul(output, 0x06, 0x04);              // 0x06(4) application reserved
+  write_str(output, 0x00, 0x02, (unsigned char *)"BM");
-  write_num(output, 0x0A, 0x04, HEADER_SIZE); // 0x0A(4) data offset
+  // 0x02(4) file size
-  write_num(output, 0x0E, 0x04, 40);          // 0x0E(4) DIB header size
+  write_num(output, 0x02, 0x04, HEADER_SIZE + data_length);
-  write_num(output, 0x12, 0x04, width);       // 0x12(4) width
+  // 0x06(4) application reserved
-  write_num(output, 0x16, 0x04, height);      // 0x16(4) height
+  write_nul(output, 0x06, 0x04);
-  write_num(output, 0x1A, 0x04, 1);           // 0x1A(2) color panes
+  // 0x0A(4) data offset
-  write_num(output, 0x1C, 0x02, color_depth * 8); // 0x1C(2) bits per pixel
+  write_num(output, 0x0A, 0x04, HEADER_SIZE);
-  write_nul(output, 0x1E, 0x04); // 0x1E(4) BI_RGB, no compression
+  // 0x0E(4) DIB header size
-  write_num(output, 0x22, 0x04,
+  write_num(output, 0x0E, 0x04, 40);
-            data_length);              // 0x22(4) size of raw bitmap data
+  // 0x12(4) width
-  write_num(output, 0x26, 0x04, 2835); // 0x26(4) horizontal print resolution
+  write_num(output, 0x12, 0x04, width);
-  write_num(output, 0x2A, 0x04, 2835); // 0x2A(4) vertical print resolution
+  // 0x16(4) height
-  write_nul(output, 0x2E, 0x04);       // 0x2E(4) color in palette
+  write_num(output, 0x16, 0x04, height);
-  write_nul(output, 0x32, 0x04);       // 0x32(4) 0 important colors
+  // 0x1A(2) color panes
+  write_num(output, 0x1A, 0x04, 1);
+  // 0x1C(2) bits per pixel
+  write_num(output, 0x1C, 0x02, color_depth * 8);
+  // 0x1E(4) BI_RGB, no compression
+  write_nul(output, 0x1E, 0x04);
+  // 0x22(4) size of raw bitmap data
+  write_num(output, 0x22, 0x04, data_length);
+  // 0x26(4) horizontal print resolution
+  write_num(output, 0x26, 0x04, 2835);
+  // 0x2A(4) vertical print resolution
+  write_num(output, 0x2A, 0x04, 2835);
+  // 0x2E(4) color in palette (0)
+  write_nul(output, 0x2E, 0x04);
+  // 0x32(4) important colors (0)
+  write_nul(output, 0x32, 0x04);
 
   return output;
 }
 
-unsigned int bmp_data_line_length(unsigned short width,
+static unsigned int bmp_data_line_length(unsigned int width,
-                                  unsigned char color_depth) {
+                                         unsigned int color_depth) {
-  unsigned int data_length =
+  unsigned int data_length, line_offset, line_padding;
-      ((unsigned int)width) * ((unsigned int)color_depth);
+
-  unsigned int line_offset = data_length % 4;
+  data_length = width * color_depth;
-  unsigned short line_padding = line_offset > 0 ? 4 - line_offset : 0;
+  line_offset = data_length % 4;
+  line_padding = line_offset > 0 ? 4 - line_offset : 0;
+
   return data_length + line_padding;
 }
 
-void bmp_data_line(unsigned char *buffer, unsigned short width,
+static void bmp_data_line(unsigned char *buffer, unsigned int width,
-                   unsigned char color_depth, unsigned char *data) {
+                          unsigned int color_depth, unsigned char *data) {
-  unsigned int data_length =
+  unsigned int data_length, line_offset, line_padding;
-      ((unsigned int)width) * ((unsigned int)color_depth);
+
-  unsigned int line_offset = data_length % 4;
+  data_length = width * color_depth;
-  unsigned short line_padding = line_offset > 0 ? 4 - line_offset : 0;
+  line_offset = data_length % 4;
+  line_padding = line_offset > 0 ? 4 - line_offset : 0;
   write_str(buffer, 0, data_length, data);
   if (line_padding > 0) {
     write_nul(buffer, width * color_depth, line_padding);
   }
 }
 
-void bmp_generate(unsigned short width, unsigned short height,
+void bmp_generate(unsigned int width, unsigned int height,
-                  unsigned char color_depth, char *file_path,
+                  unsigned int color_depth, bool descending, char *file_path,
                   line_fn generate_line) {
   FILE *fptr;
+  unsigned char *header, *data_buffer, *line_buffer;
+  unsigned int data_length, line_length, y;
+
   fptr = fopen(file_path, "w");
-  unsigned char *header = bmp_header(width, height, color_depth);
+  header = bmp_header(width, height, color_depth);
   fwrite(header, HEADER_SIZE, 1, fptr);
   free(header);
-  unsigned int data_length =
+  data_length = width * color_depth;
-      ((unsigned int)width) * ((unsigned int)color_depth);
+  line_length = bmp_data_line_length(width, color_depth);
-  unsigned short y;
+  data_buffer = malloc(data_length * sizeof(unsigned char));
-  unsigned char *data_buffer = (unsigned char *)malloc(data_length);
+  line_buffer = malloc(line_length * sizeof(unsigned char));
-  unsigned char *line_buffer =
-      (unsigned char *)malloc(bmp_data_line_length(width, color_depth));
   for (y = 0; y < height; y++) {
-    generate_line(height - y - 1, data_buffer, data_length);
+    generate_line(y, data_buffer, data_length);
     bmp_data_line(line_buffer, width, color_depth, data_buffer);
-    fwrite(line_buffer, bmp_data_line_length(width, color_depth), 1, fptr);
+    if (descending) {
+      fseek(fptr, HEADER_SIZE + (height - y - 1) * line_length, SEEK_SET);
+    }
+    fwrite(line_buffer, line_length, 1, fptr);
   }
   free(line_buffer);
   free(data_buffer);

src/bmp.h

@@ -3,8 +3,8 @@
 #ifndef BMP_H
 #define BMP_H
 
-void bmp_generate(unsigned short width, unsigned short height,
+void bmp_generate(unsigned int width, unsigned int height,
-                  unsigned char color_depth, char *file_path,
+                  unsigned int color_depth, bool descending, char *file_path,
                   line_fn generate_line);
 
 #endif

src/config.h

@@ -0,0 +1,12 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#ifndef PACKAGE
+#define PACKAGE "margen"
+#endif
+
+#ifndef VERSION
+#define VERSION "(dev)"
+#endif
+
+#endif

src/const.h

@@ -1,7 +0,0 @@
-#ifndef CONST_H
-#define CONST_H
-
-#define NAME "margen"
-#define VERSION "v1.0.1"
-
-#endif

src/generator.c

@@ -1,29 +1,36 @@
-#include "args.h"
-#include "bmp.h"
-#include "const.h"
-#include "rand.h"
-#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
-parameters global_params;
+#include "args.h"
-float slope;
+#include "bmp.h"
-unsigned char color_depth;
+#include "config.h"
-unsigned int line_width;
+#include "rand.h"
-unsigned char *last_line;
-unsigned char *current_line;
 
-unsigned char generate_pixel(unsigned char depth, unsigned char top_pixel,
+#define BMP_COLOR_DEPTH 3
-                             unsigned char left_pixel) {
+
-  float v = fminf(
+static Parameters global_params;
-      255.0, fmaxf(0.0, (rand_float(2.0) - 1.0) * global_params.var[depth] +
+static float slope;
-                            ((float)left_pixel) * slope +
+static unsigned char color_depth;
-                            ((float)top_pixel) * (1.0 - slope)));
+static unsigned int line_width;
-  return (unsigned char)v;
+static unsigned char *last_line;
+static unsigned char *current_line;
+
+static unsigned char generate_pixel(unsigned char depth,
+                                    unsigned char top_pixel,
+                                    unsigned char left_pixel) {
+  int k, v;
+
+  k = rand_uint(global_params.var[depth] + 1);
+  v = (rand_uint(2) == 0 ? k : -k) + (left_pixel)*slope +
+      (top_pixel) * (1.0 - slope);
+
+  return (unsigned char)(v < 0 ? 0 : (v > 255 ? (unsigned char)255 : v));
 }
 
-void generate_line() {
+static void generate_line() {
   unsigned int i;
+
   for (i = 0; i < line_width; i++) {
     last_line[i] = current_line[i];
   }
@@ -38,26 +45,29 @@ void generate_line() {
   }
 }
 
-void generate_bmp_line(unsigned short y, unsigned char *data_buffer,
+static void generate_bmp_line(unsigned int y, unsigned char *data_buffer,
-                       unsigned int len) {
+                              unsigned int len) {
   unsigned int i;
   unsigned int x;
-  if (y > 0 && (y % global_params.size) == 0) {
+
+  if (y % global_params.size == 0) {
     generate_line();
   }
   for (i = 0; i < len; i++) {
-    x = i / (color_depth * global_params.size);
+    x = i / (BMP_COLOR_DEPTH * global_params.size);
-    data_buffer[i] = current_line[x * color_depth + (i % color_depth)];
+    data_buffer[(global_params.rotation / 2) == 1 ? i : (len - i - 1)] =
+        current_line[x * color_depth + (i % color_depth)];
   }
 }
 
-void debug_parameters(parameters params) {
+static void debug_parameters(Parameters params) {
   if (!params.quiet) {
     printf("  output  %s\n", params.file_path);
     printf("  seed    %ld\n", params.seed);
     printf("  width   %d\n", params.width);
     printf("  height  %d\n", params.height);
     printf("  pixel   %d\n", params.size);
+    printf("  slope   %d\n", params.slope);
     if (params.monochrome) {
       printf("  color   %u\n", params.start[0]);
       printf("  var.    %u\n", params.var[0]);
@@ -67,36 +77,48 @@ void debug_parameters(parameters params) {
       printf("  var.    %u,%u,%u\n", params.var[0], params.var[1],
              params.var[2]);
     }
+    printf("  rot.    %d\n", params.rotation);
   }
 }
 
-void init(parameters params) {
+static void init(Parameters params) {
+  unsigned int i;
+
   global_params = params;
   slope = ((float)params.slope) / 255.0;
   color_depth = params.monochrome ? 1 : 3;
   debug_parameters(params);
   line_width = ((params.width / params.size) + 1) * color_depth;
-  last_line = (unsigned char *)malloc(line_width);
+  last_line = malloc(line_width * sizeof(unsigned char));
-  current_line = (unsigned char *)malloc(line_width);
+  current_line = malloc(line_width * sizeof(unsigned char));
-  unsigned int i = 0;
   for (i = 0; i < line_width; i++) {
     current_line[i] = params.start[i % color_depth];
   }
-  set_seed(params.seed);
+  rand_seed(params.seed);
-  generate_line();
 }
 
-void clean() {
+static void clean() {
   free(last_line);
   free(current_line);
 }
 
-void generate(parameters params) {
+static void print_time(Parameters params, clock_t start) {
   if (!params.quiet) {
-    puts(NAME " " VERSION);
+    clock_t now = clock();
+    printf("time: %.3fs\n", (float)(now - start) / CLOCKS_PER_SEC);
   }
-  init(params);
+}
-  bmp_generate(params.width, params.height, color_depth, params.file_path,
+
-               generate_bmp_line);
+void generator_run(Parameters params) {
-  clean();
+  clock_t start;
+
+  if (!params.quiet) {
+    puts(PACKAGE " " VERSION);
+  }
+  start = clock();
+  init(params);
+  bmp_generate(params.width, params.height, BMP_COLOR_DEPTH,
+               params.rotation % 2 == 1, params.file_path, generate_bmp_line);
+  clean();
+  print_time(params, start);
 }

src/generator.h

@@ -3,6 +3,6 @@
 #ifndef GENERATOR_H
 #define GENERATOR_H
 
-void generate(parameters params);
+void generator_run(Parameters params);
 
 #endif

src/main.c

@@ -1,9 +1,15 @@
+#include <stdlib.h>
+
 #include "args.h"
 #include "generator.h"
+#include "main.h"
+#include "types.h"
 
 int main(int argc, char **argv) {
-  parameters params;
+  Parameters params;
-  params = parse_args(argc, argv);
+
-  generate(params);
+  params = args_parse(argc, argv);
-  return 0;
+  generator_run(params);
+
+  return EXIT_SUCCESS;
 }

src/main.h

@@ -1,4 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+int main(int argc, char **argv);
+
 #endif

src/rand.c

@@ -1,21 +1,27 @@
-#include <math.h>
+#include "rand.h"
 
-float seed;
+static unsigned long long mcg_state = 0xcafef00dd15ea5e5u; // Must be odd
+static unsigned long long const multiplier = 6364136223846793005u;
 
-void set_seed(unsigned long new_seed) { seed = (float)(new_seed % 1000000); }
+// https://en.wikipedia.org/wiki/Permuted_congruential_generator
+static unsigned long rand(void) {
+  unsigned long long x;
+  unsigned count;
 
-float rand(float seed) {
+  x = mcg_state;
-  float v = powf(seed, 6. / 7.);
+  count = (unsigned)(x >> 61);
-  v *= sinf(v) + 1.;
+
-  return v - floorf(v);
+  mcg_state = x * multiplier;
+  x ^= x >> 22;
+
+  return (unsigned long)(x >> (22 + count));
 }
 
-float rand_float(const float max) { return rand(seed++) * max; }
+void rand_seed(unsigned long long seed) {
-
+  mcg_state = 2 * seed + 1;
-unsigned char rand_uchar(const unsigned int max) {
+  (void)rand();
-  return (unsigned char)(rand(seed++) * max);
 }
 
-unsigned short rand_ushort(const unsigned int max) {
+unsigned int rand_uint(unsigned int max) {
-  return (unsigned short)(rand(seed++) * max);
+  return max == 0 ? 0 : (unsigned int)(rand() % max);
 }

src/rand.h

@@ -1,9 +1,7 @@
 #ifndef RAND_H
 #define RAND_H
 
-void set_seed(unsigned long new_seed);
+void rand_seed(unsigned long long seed);
-float rand_float(const float max);
+unsigned int rand_uint(unsigned int max);
-unsigned char rand_uchar(unsigned int max);
-unsigned short rand_ushort(unsigned int max);
 
 #endif

src/types.h

@@ -3,22 +3,21 @@
 #ifndef TYPES_H
 #define TYPES_H
 
-struct Parameters {
+typedef struct Parameters {
   bool quiet;
   bool monochrome;
   unsigned long seed;
-  unsigned short width;
+  unsigned int width;
-  unsigned short height;
+  unsigned int height;
   char *file_path;
-  unsigned short size;
+  unsigned int size;
-  unsigned char slope;
+  unsigned int slope;
-  unsigned char start[3];
+  unsigned int start[3];
-  unsigned char var[3];
+  unsigned int var[3];
-};
+  unsigned int rotation;
+} Parameters;
 
-typedef struct Parameters parameters;
+typedef void line_fn(unsigned int y, unsigned char *data_buffer,
-
-typedef void line_fn(unsigned short y, unsigned char *data_buffer,
                      unsigned int len);
 
 #endif