Reformat

Reviewed-on: #1
Co-authored-by: Abdelrahman <said.abdelrahman89@gmail.com>
Co-committed-by: Abdelrahman <said.abdelrahman89@gmail.com>

.gitignore

@@ -1,6 +1,9 @@
 .cache
 refs
 file_example*
+big_endian*
+float32_example.tiff
 *.py
 tiffread
+test*
 compile_commands.json

compile

@@ -1,24 +1,41 @@
 #!/bin/bash
 
+BUILD_TYPE="debug"
+
+while [[ $# > 0 ]];do
+  case $1 in
+    --release)
+      BUILD_TYPE="release"
+      shift
+      ;;
+    *|-*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+  esac
+done
+
 CC=clang
-CFLAGS="-g -Wall -Werror -pedantic -fsanitize=address -fsanitize=undefined"
+
+if [[ $BUILD_TYPE == "release" ]]; then
+  CFLAGS="-O3 -Wall -Werror -pedantic"
+else
+  CFLAGS="-g -Wall -Werror -pedantic -fsanitize=address -fsanitize=undefined -DDEBUG"
+fi
+
 INCLUDES="\
-	-I$(find ./src -type d | xargs -I{} echo -n "-I{} ") \
+  -I$(find ./src -type d | xargs -I{} echo -n "-I{} ") \
-	-Iintern/wizapp/aliases \
+  $(find intern/wizapp/src -type d | xargs -I{} echo -n "-I{} ") \
-	-Iintern/wizapp/cpath/include \
+  $(pkg-config --cflags sdl2) \
-	-Iintern/wizapp/dstr/include \
-	$(find intern/wizapp/mem/include -type d | xargs -I{} echo -n "-I{} ") \
-	$(pkg-config --cflags sdl2) \
 "
 LIBS="\
-	-lm \
+  -lm \
-	$(pkg-config --libs sdl2) \
+  -pthread \
+  $(pkg-config --libs sdl2) \
 "
 SRC="\
-	$(find ./src -name *.c | xargs -I{} echo -n "{} ") \
+  $(find ./src -name "*.c" | xargs -I{} echo -n "{} ") \
-	intern/wizapp/cpath/src/*.c \
+  $(find intern/wizapp/src -type f -name "*.c" | xargs -I{} echo -n "{} ") \
-	intern/wizapp/dstr/src/*.c \
-	intern/wizapp/mem/src/*/*.c \
 "
 OUT=tiffread
 

src/image/image.c

@@ -1,45 +1,26 @@
 #include "image.h"
-#include "mem_allocator.h"
+#include "mem_arena.h"
-#include "mem_libc.h"
 #include <stddef.h>
 #include <string.h>
 
-Image *create_image(u64 width, u64 height, Pixel *data,
+Image *create_image(u64 width, u64 height, Pixel *data, Arena *arena) {
-                    const Allocator *allocator) {
+  if (!arena) {
-  Allocator alloc;
+    return NULL;
-  if (!allocator) {
-    alloc = wapp_mem_libc_allocator();
-  } else {
-    alloc = *allocator;
   }
 
-  u64 buf_length = width * height;
+  u64 pixel_count = width * height;
-  u64 total_size = sizeof(Image) + sizeof(Pixel) * buf_length;
+  u64 buf_length = sizeof(Pixel) * pixel_count;
+  u64 alloc_size = sizeof(Image) + buf_length;
 
-  Image *img = wapp_mem_allocator_alloc(&alloc, total_size);
+  Image *img = wapp_mem_arena_alloc(arena, alloc_size);
   if (!img) {
     return NULL;
   }
 
   img->width = width;
   img->height = height;
-  img->buf_length = buf_length;
+  img->pixel_count = pixel_count;
   memcpy(img->data, data, buf_length);
 
   return img;
 }
-
-void destroy_image(Image **img, const Allocator *allocator) {
-  if (!img || !(*img)) {
-    return;
-  }
-
-  Allocator alloc;
-  if (!allocator) {
-    alloc = wapp_mem_libc_allocator();
-  } else {
-    alloc = *allocator;
-  }
-
-  wapp_mem_allocator_free(&alloc, (void **)img);
-}

src/image/image.h

@@ -1,7 +1,7 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "mem_allocator.h"
+#include "mem_arena.h"
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -20,13 +20,11 @@ typedef struct image Image;
 struct image {
   u64 width;
   u64 height;
-  u64 buf_length;
+  u64 pixel_count;
   Pixel data[];
 };
 
-Image *create_image(u64 width, u64 height, Pixel *data,
+Image *create_image(u64 width, u64 height, Pixel *data, Arena *arena);
-                    const Allocator *allocator);
-void destroy_image(Image **img, const Allocator *allocator);
 
 #ifdef __cplusplus
 }

src/main.c

@@ -1,21 +1,26 @@
 #include "aliases.h"
 #include "image.h"
-#include "mem_allocator.h"
+#include "mem_arena.h"
-#include "mem_ctx.h"
 #include "tiffread.h"
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_events.h>
+#include <SDL2/SDL_rect.h>
 #include <SDL2/SDL_render.h>
 #include <SDL2/SDL_surface.h>
 #include <SDL2/SDL_video.h>
 #include <netinet/in.h>
+#include <pthread.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#define MAIN_ARENA_CAPACITY 50 * 1024 * 1024
+
 #define WINDOW_WIDTH 800
 #define WINDOW_HEIGHT 600
+#define VIEW_AREA_WIDTH 700
+#define VIEW_AREA_HEIGHT 500
 
 #define AMASK 0xff000000
 #define BMASK 0x00ff0000
@@ -30,24 +35,110 @@ struct point {
   u32 y;
 };
 
-Point point_from_index(u32 index, u32 w);
+internal void write_debug_ppm6(const Image *img);
+internal void *load_tiff_image(void *args);
+internal SDL_Rect get_dest_rect(SDL_Surface *surface);
+
+typedef struct img_thread_args ImgThreadArgs;
+struct img_thread_args {
+  const char *filename;
+  Arena *arena;
+};
 
 int main(int argc, char *argv[]) {
   int exit_code = EXIT_SUCCESS;
 
-  wapp_mem_ctx_init(10 * 1024 * 1024, 2 * 1024 * 1024);
+  Arena *arena = NULL;
-  Allocator ctx_main_allocator = wapp_mem_ctx_allocator(CTX_DEST_BUFFER_MAIN);
+  if (!wapp_mem_arena_init(&arena, MAIN_ARENA_CAPACITY)) {
-  Allocator ctx_temp_allocator = wapp_mem_ctx_allocator(CTX_DEST_BUFFER_TEMP);
+    return EXIT_FAILURE;
-  (void)(ctx_temp_allocator);
+  }
 
   const char *file_to_open = argc > 1 ? argv[1] : "./resources/test.tif";
 
-  Image *img = read_baseline_tiff(file_to_open, &ctx_main_allocator);
+  pthread_t img_thread;
-  if (!img) {
+  ImgThreadArgs args = {.filename = file_to_open, .arena = arena};
+  if (pthread_create(&img_thread, NULL, load_tiff_image, &args) != 0) {
     exit_code = EXIT_FAILURE;
-    goto MAIN_FREE_CONTEXT;
+    goto MAIN_DESTROY_ARENA;
   }
 
+  if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
+    exit_code = EXIT_FAILURE;
+    goto MAIN_DESTROY_ARENA;
+  };
+
+  SDL_Window *window =
+      SDL_CreateWindow("Window", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
+                       WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN);
+  if (!window) {
+    exit_code = EXIT_FAILURE;
+    goto MAIN_QUIT_SDL;
+  }
+
+  SDL_Renderer *renderer = SDL_CreateRenderer(
+      window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
+  if (!renderer) {
+    exit_code = EXIT_FAILURE;
+    goto MAIN_DESTROY_WINDOW;
+  }
+
+  SDL_Surface *surface = NULL;
+  if (pthread_join(img_thread, (void **)&surface) != 0 || !surface) {
+    exit_code = EXIT_FAILURE;
+    goto MAIN_DESTROY_RENDERER;
+  }
+
+  SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
+  if (!texture) {
+    exit_code = EXIT_FAILURE;
+    goto MAIN_DESTROY_SURFACE;
+  }
+
+  SDL_Rect dest = get_dest_rect(surface);
+
+  bool running = true;
+
+  SDL_Event event = {0};
+
+  while (running) {
+    while (SDL_PollEvent(&event)) {
+      switch (event.type) {
+      case SDL_QUIT:
+        running = false;
+        break;
+      }
+    }
+
+    SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+
+    SDL_RenderClear(renderer);
+
+    SDL_RenderCopy(renderer, texture, NULL, &dest);
+
+    SDL_RenderPresent(renderer);
+  }
+
+  SDL_DestroyTexture(texture);
+
+MAIN_DESTROY_SURFACE:
+  SDL_FreeSurface(surface);
+
+MAIN_DESTROY_RENDERER:
+  SDL_DestroyRenderer(renderer);
+
+MAIN_DESTROY_WINDOW:
+  SDL_DestroyWindow(window);
+
+MAIN_QUIT_SDL:
+  SDL_Quit();
+
+MAIN_DESTROY_ARENA:
+  wapp_mem_arena_destroy(&arena);
+
+  return exit_code;
+}
+
+internal void write_debug_ppm6(const Image *img) {
   FILE *out = fopen("test.ppm", "wb");
 
   char magic[] = {'P', '6', '\n'};
@@ -61,115 +152,51 @@ int main(int argc, char *argv[]) {
   char max[] = {'2', '5', '5', '\n'};
   fwrite(max, sizeof(max), 1, out);
 
-  for (u64 i = 0; i < img->buf_length; i += 4) {
+  for (u64 i = 0; i < img->pixel_count; ++i) {
     fwrite(&(img->data[i]), sizeof(u8), 3, out);
   }
 
   fclose(out);
-
-  // if (SDL_Init(SDL_INIT_EVERYTHING) != 0) {
-  //   exit_code = EXIT_FAILURE;
-  //   goto MAIN_FREE_CONTEXT;
-  // };
-
-  // SDL_Window *window =
-  //     SDL_CreateWindow("Window", SDL_WINDOWPOS_CENTERED,
-  //     SDL_WINDOWPOS_CENTERED,
-  //                      WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN);
-  // if (!window) {
-  //   exit_code = EXIT_FAILURE;
-  //   goto MAIN_QUIT_SDL;
-  // }
-
-  // SDL_Renderer *renderer = SDL_CreateRenderer(
-  //     window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-  // if (!renderer) {
-  //   exit_code = EXIT_FAILURE;
-  //   goto MAIN_DESTROY_WINDOW;
-  // }
-
-  // SDL_Surface *surface = SDL_CreateRGBSurface(0, img->width, img->height, 32,
-  //                                             RMASK, GMASK, BMASK, AMASK);
-  // if (!surface) {
-  //   exit_code = EXIT_FAILURE;
-  //   goto MAIN_DESTROY_RENDERER;
-  // }
-
-  // uint64_t surface_length = surface->h * surface->pitch;
-  // printf("%lu\n", surface_length);
-  // printf("%u\n", surface->w * surface->h);
-
-  // SDL_LockSurface(surface);
-  // u64 position = 0;
-  // for (u64 i = 0; i < surface_length; i += surface->pitch) {
-  //   memcpy(&(((u32 *)surface->pixels)[i]), &(img->data[position]),
-  //          surface->pitch / sizeof(Pixel));
-
-  //   position += surface->pitch;
-  // }
-  // SDL_UnlockSurface(surface);
-
-  // SDL_Texture *texture = SDL_CreateTextureFromSurface(renderer, surface);
-  // if (!texture) {
-  //   exit_code = EXIT_FAILURE;
-  //   goto MAIN_DESTROY_SURFACE;
-  // }
-
-  // SDL_Rect dest = {
-  //     .w = surface->w,
-  //     .h = surface->h,
-  //     .x = (WINDOW_WIDTH - surface->w) / 2,
-  //     .y = (WINDOW_HEIGHT - surface->h) / 2,
-  // };
-
-  // bool running = true;
-
-  // SDL_Event event = {0};
-
-  // while (running) {
-  //   while (SDL_PollEvent(&event)) {
-  //     switch (event.type) {
-  //     case SDL_QUIT:
-  //       running = false;
-  //       break;
-  //     }
-  //   }
-
-  //   SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
-
-  //   SDL_RenderClear(renderer);
-
-  //   SDL_RenderCopy(renderer, texture, NULL, &dest);
-
-  //   SDL_RenderPresent(renderer);
-  // }
-
-  // SDL_DestroyTexture(texture);
-
-  // MAIN_DESTROY_SURFACE:
-  // SDL_FreeSurface(surface);
-
-  // MAIN_DESTROY_RENDERER:
-  // SDL_DestroyRenderer(renderer);
-
-  // MAIN_DESTROY_WINDOW:
-  // SDL_DestroyWindow(window);
-
-  // MAIN_QUIT_SDL:
-  // SDL_Quit();
-
-MAIN_FREE_CONTEXT:
-  wapp_mem_ctx_free();
-
-  return exit_code;
 }
 
-Point point_from_index(u32 index, u32 w) {
+internal void *load_tiff_image(void *args) {
-  Point out = {0};
+  ImgThreadArgs *img_args = (ImgThreadArgs *)args;
+  Image *img = read_baseline_tiff(img_args->filename, img_args->arena);
+  if (!img) {
+    return NULL;
+  }
 
-  out.x = index % w;
+  write_debug_ppm6(img);
 
-  out.y = (index - (index % w)) / w;
+  SDL_Surface *surface = SDL_CreateRGBSurface(0, img->width, img->height, 32,
+                                              RMASK, GMASK, BMASK, AMASK);
+  if (!surface) {
+    return NULL;
+  }
 
-  return out;
+  SDL_LockSurface(surface);
+  u64 position = 0;
+  for (u64 i = 0; i < img->pixel_count; i += surface->w) {
+    void *start = (void *)((uptr)(surface->pixels) + position);
+
+    memcpy(start, &(img->data[i]), surface->w * sizeof(Pixel));
+
+    position += surface->pitch;
+  }
+  SDL_UnlockSurface(surface);
+
+  return surface;
+}
+
+internal SDL_Rect get_dest_rect(SDL_Surface *surface) {
+  f64 ratio = (f64)(surface->h) / (f64)(surface->w);
+  u64 width = surface->w <= VIEW_AREA_WIDTH ? surface->w : VIEW_AREA_WIDTH;
+  u64 height = width * ratio;
+
+  return (SDL_Rect){
+      .w = width,
+      .h = height,
+      .x = (WINDOW_WIDTH - width) / 2,
+      .y = (WINDOW_HEIGHT - height) / 2,
+  };
 }

src/tiff/tiffread.h

@@ -1,130 +1,14 @@
 #ifndef TIFFREAD_H
 #define TIFFREAD_H
 
+#include "mem_arena.h"
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-#include "aliases.h"
 #include "image.h"
-#include <stdbool.h>
 
-#define TYPE_MAX_COUNT (UINT8_MAX * sizeof(const char *))
+Image *read_baseline_tiff(const char *file, Arena *arena);
-
-typedef struct hdr TiffHdr;
-struct hdr {
-  u16 order;
-  u16 magic;
-  u32 first_ifd_offset;
-};
-
-typedef struct field TiffField;
-struct field {
-  u16 tag;
-  u16 type;
-  u32 count;
-  u32 value_offset;
-};
-
-typedef struct IFD TiffIFD;
-struct IFD {
-  u16 count;
-  TiffField *fields;
-  u32 next_ifd;
-};
-
-// clang-format off
-enum tiff_byte_order {
-  TIFF_ORDER_LITTLE_ENDIAN = 0x4949,
-  TIFF_ORDER_BIG_ENDIAN    = 0x4d4d,
-};
-
-enum tiff_public_tags {
-  #include "tiff_public_tags.inc"
-};
-
-enum tiff_field_types {
-  #include "tiff_field_types.inc"
-};
-
-typedef struct field_type TiffFieldType;
-struct field_type {
-  const char *name;
-  u16 byte_count;
-};
-
-internal TiffFieldType field_types[TYPE_MAX_COUNT] = {
-  #define TIFF_TYPE_LOOKUP
-  #include "tiff_field_types.inc"
-  #undef TIFF_TYPE_LOOKUP
-};
-
-typedef enum tiff_image_type_names {
-  TIFF_IMAGE_TYPE_INVALID   = 0,
-  TIFF_IMAGE_TYPE_BILEVEL   = 1,
-  TIFF_IMAGE_TYPE_GRAYSCALE = TIFF_PUBLIC_TAG_BITS_PER_SAMPLE,
-  TIFF_IMAGE_TYPE_PALETTE   = TIFF_PUBLIC_TAG_BITS_PER_SAMPLE | TIFF_PUBLIC_TAG_COLOR_MAP,
-  TIFF_IMAGE_TYPE_RGB       = TIFF_PUBLIC_TAG_BITS_PER_SAMPLE | TIFF_PUBLIC_TAG_SAMPLES_PER_PIXEL,
-} TiffImageType;
-
-enum tiff_extra_samples {
-  TIFF_EXTRA_SAMPLE_UNSPECIFIED        = 0x0000,
-  TIFF_EXTRA_SAMPLE_ASSOCIATED_ALPHA   = 0x0001,
-  TIFF_EXTRA_SAMPLE_UNASSOCIATED_ALPHA = 0x0002,
-};
-
-enum tiff_compression {
-  TIFF_COMPRESSION_UNCOMPRESSED = 0x0001,
-  TIFF_COMPRESSION_CCITT_1D     = 0x0002,
-  TIFF_COMPRESSION_GROUP_3_FAX  = 0x0003,
-  TIFF_COMPRESSION_GROUP_4_FAX  = 0x0004,
-  TIFF_COMPRESSION_LZW          = 0x0005,
-  TIFF_COMPRESSION_JPEG         = 0x0006,
-  TIFF_COMPRESSION_PACK_BITS    = 0x8005,
-};
-
-enum tiff_photometric_interpretation {
-  TIFF_PHOTOMETRIC_INTERPRETATION_WHITE_IS_ZERO     = 0x0000,
-  TIFF_PHOTOMETRIC_INTERPRETATION_BLACK_IS_ZERO     = 0x0001,
-  TIFF_PHOTOMETRIC_INTERPRETATION_RGB               = 0x0002,
-  TIFF_PHOTOMETRIC_INTERPRETATION_RGB_PALETTE       = 0x0003,
-  TIFF_PHOTOMETRIC_INTERPRETATION_TRANSPARENCY_MASK = 0x0004,
-  TIFF_PHOTOMETRIC_INTERPRETATION_CMYK              = 0x0005,
-  TIFF_PHOTOMETRIC_INTERPRETATION_YCbCr             = 0x0006,
-  TIFF_PHOTOMETRIC_INTERPRETATION_CIELab            = 0x0008,
-
-  TIFF_PHOTOMETRIC_INTERPRETATION_INVALID,
-};
-
-enum tiff_planar_configuration {
-  TIFF_PLANAR_CONFIG_CHUNKY = 0x0001,
-  TIFF_PLANAR_CONFIG_PLANAR = 0x0002,
-};
-// clang-format on
-
-typedef struct tiff_image TiffImage;
-struct tiff_image {
-  TiffImageType type;
-  u32 image_width;
-  u32 image_length;
-  u32 bits_per_sample;
-  u32 sample_count;
-  bool bits_per_sample_offset;
-  u16 compression;
-  u16 photometric_interpretation;
-  u32 strip_offsets;
-  bool strip_offsets_offset;
-  u32 rows_per_strip;
-  u32 strip_byte_counts;
-  bool strip_byte_counts_offset;
-  u32 strip_count;
-  u32 color_map;
-  u32 extra_samples;
-  u32 extra_samples_count;
-  bool extra_samples_offset;
-};
-
-Image *read_baseline_tiff(const char *file, const Allocator *allocator);
 
 #ifdef __cplusplus
 }