try build

.gitea/workflows/demo.yaml

@@ -1,19 +0,0 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 
-on: [push]
-
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
-      - run: echo "This job's status is ${{ job.status }}."

.gitea/workflows/run_build.yaml

@@ -0,0 +1,20 @@
+name: Run Build
+run-name: ${{ gitea.actor }} is building tview
+on: [push]
+
+jobs:
+  run-builds:
+    name: Run build
+    container:
+      image: ubuntu:latest
+      steps:
+        - name: Checkout repo
+          uses: actions/checkout@v2
+        - name: Run ls
+          run: ls
+        - name: Install things
+          run: apt update && apt install build-essential cmake libsdl2-dev libexiv2-dev mesa-utils
+        - name: Generate
+          run: cmake .
+        - name: Build
+          run: cmake --build .

.gitignore

@@ -34,3 +34,18 @@
 imgui.ini
 
 tview
+
+#CMake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+CMakeUserPresets.json
+

CMakeLists.txt

@@ -0,0 +1,50 @@
+cmake_minimum_required(VERSION 3.10)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED True)
+
+project(tview)
+
+set (SOURCES
+lib/backends/imgui_impl_opengl3.cpp
+lib/backends/imgui_impl_opengl3.h
+lib/backends/imgui_impl_opengl3_loader.h
+lib/backends/imgui_impl_sdl2.cpp
+lib/backends/imgui_impl_sdl2.h
+lib/backends/tex_inspect_opengl.h
+lib/backends/tex_inspect_opengl.cpp
+lib/context_wrapper.h
+lib/image_model.h
+lib/imconfig.h
+lib/imfilebrowser.h
+lib/imgui.cpp
+lib/imgui.h
+lib/imgui_bezier_math.h
+lib/imgui_bezier_math.inl
+lib/imgui_demo.cpp
+lib/imgui_draw.cpp
+lib/imgui_extra_math.h
+lib/imgui_extra_math.inl
+lib/imgui_internal.h
+lib/imgui_tables.cpp
+lib/imgui_widgets.cpp
+lib/imstb_rectpack.h
+lib/imstb_textedit.h
+lib/imstb_truetype.h
+lib/stb_image.h
+lib/imgui_tex_inspect.h
+lib/imgui_tex_inspect_internal.h
+lib/imgui_tex_inspect.cpp
+lib/argparse.hpp
+lib/histogram.h
+main.cpp
+)
+
+set(OpenGL_GL_PREFERENCE GLVND)
+find_package(SDL2 REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(exiv2 REQUIRED)
+include_directories(${SDL2_INCLUDE_DIRS} ${OPENGL_INCLUDE_DIRS})
+
+add_executable(tview ${SOURCES})
+target_link_libraries(tview ${SDL2_LIBRARIES} ${OPENGL_LIBRARIES} exiv2lib)

Makefile

@@ -1,91 +0,0 @@
-#
-# Cross Platform Makefile
-# Compatible with MSYS2/MINGW, Ubuntu 14.04.1 and Mac OS X
-#
-# You will need SDL2 (http://www.libsdl.org):
-# Linux:
-#   apt-get install libsdl2-dev
-# Mac OS X:
-#   brew install sdl2
-# MSYS2:
-#   pacman -S mingw-w64-i686-SDL2
-#
-
-#CXX = g++
-#CXX = clang++
-
-EXE = tview
-IMGUI_DIR = lib
-SOURCES = main.cpp
-SOURCES += $(wildcard $(IMGUI_DIR)/*.cpp)
-SOURCES += $(wildcard $(IMGUI_DIR)/backends/*.cpp)
-OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
-UNAME_S := $(shell uname -s)
-LINUX_GL_LIBS = -lGL
-
-CXXFLAGS = -std=c++20 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
-CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -Ofast
-LIBS = -lexiv2
-
-##---------------------------------------------------------------------
-## OPENGL ES
-##---------------------------------------------------------------------
-
-## This assumes a GL ES library available in the system, e.g. libGLESv2.so
-# CXXFLAGS += -DIMGUI_IMPL_OPENGL_ES2
-# LINUX_GL_LIBS = -lGLESv2
-## If you're on a Raspberry Pi and want to use the legacy drivers,
-## use the following instead:
-# LINUX_GL_LIBS = -L/opt/vc/lib -lbrcmGLESv2
-
-##---------------------------------------------------------------------
-## BUILD FLAGS PER PLATFORM
-##---------------------------------------------------------------------
-
-ifeq ($(UNAME_S), Linux) #LINUX
-	ECHO_MESSAGE = "Linux"
-	LIBS += $(LINUX_GL_LIBS) -ldl -L/usr/lib -lSDL2
-
-	CXXFLAGS += -I/usr/include/SDL2 -D_REENTRANT
-	CFLAGS = $(CXXFLAGS)
-endif
-
-ifeq ($(UNAME_S), Darwin) #APPLE
-	ECHO_MESSAGE = "Mac OS X"
-	LIBS += -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo `sdl2-config --libs`
-	LIBS += -L/usr/local/lib -L/opt/local/lib
-
-	CXXFLAGS += `sdl2-config --cflags`
-	CXXFLAGS += -I/usr/local/include -I/opt/local/include
-	CFLAGS = $(CXXFLAGS)
-endif
-
-ifeq ($(OS), Windows_NT)
-    ECHO_MESSAGE = "MinGW"
-    LIBS += -lgdi32 -lopengl32 -limm32 `pkg-config --static --libs sdl2`
-
-    CXXFLAGS += `pkg-config --cflags sdl2`
-    CFLAGS = $(CXXFLAGS)
-endif
-
-##---------------------------------------------------------------------
-## BUILD RULES
-##---------------------------------------------------------------------
-
-%.o:%.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-%.o:$(IMGUI_DIR)/%.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-%.o:$(IMGUI_DIR)/backends/%.cpp
-	$(CXX) $(CXXFLAGS) -c -o $@ $<
-
-all: $(EXE)
-	@echo Build complete for $(ECHO_MESSAGE)
-
-$(EXE): $(OBJS)
-	$(CXX) -o $@ $^ $(CXXFLAGS) $(LIBS)
-
-clean:
-	rm -f $(EXE) $(OBJS)

lib/backends/tex_inspect_opengl.cpp

@@ -77,11 +77,16 @@ using namespace gl;
 #elif defined(IMGUI_IMPL_OPENGL_LOADER_EPOXY)
 #include <epoxy/gl.h>
 #else
+#if defined(__APPLE__)
+#include <OpenGL/gl.h>
+#include <OpenGL/gl3.h>
+#else
 #include <SDL2/SDL_opengl.h>
 #include <SDL2/SDL_opengles2.h>
 #include <SDL2/SDL_opengles2_gl2.h>
 #endif
 #endif
+#endif
 
 // Desktop GL 3.2+ has glDrawElementsBaseVertex() which GL ES and WebGL don't have.
 #if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && defined(GL_VERSION_3_2)

lib/histogram.h

@@ -0,0 +1,88 @@
+#include <cstdint>
+#include "./imgui.h"
+#include "./imgui_internal.h"
+
+class Histogram {
+
+public:
+  unsigned int count[4][256] = {0};
+  int width;
+  int height;
+  int channels;
+
+  Histogram(int width, int height, int channels) {
+    this->width = width;
+    this->height = height;
+    this->channels = channels;
+  }
+
+  void Load(uint8_t * image) {
+    for (int l = 0; l < height * width; l++)
+    {
+      count[0][*image++]++;
+      count[1][*image++]++;
+      count[2][*image++]++;
+      count[3][*image++]++;
+    }
+  };
+
+  void Draw() {
+    ImGui::InvisibleButton("histogram", ImVec2(512, 256));
+
+    unsigned int maxv = count[0][0];
+    unsigned int* pCount = &count[0][0];
+    for (int i = 0; i < 3 * 256; i++, pCount++)
+    {
+      maxv = (maxv > *pCount) ? maxv : *pCount;
+    }
+
+    ImDrawList* drawList = ImGui::GetWindowDrawList();
+    const ImVec2 rmin = ImGui::GetItemRectMin();
+    const ImVec2 rmax = ImGui::GetItemRectMax();
+    const ImVec2 size = ImGui::GetItemRectSize();
+    const float hFactor = size.y / float(maxv);
+
+    for (int i = 0; i <= 10; i++)
+    {
+      float ax = rmin.x + (size.x / 10.f) * float(i);
+      float ay = rmin.y + (size.y / 10.f) * float(i);
+      drawList->AddLine(ImVec2(rmin.x, ay), ImVec2(rmax.x, ay), 0x80808080);
+      drawList->AddLine(ImVec2(ax, rmin.y), ImVec2(ax, rmax.y), 0x80808080);
+    }
+
+    const float barWidth = (size.x / 256.f);
+    for (int j = 0; j < 256; j++)
+    {
+      // pixel count << 2 + color index(on 2 bits)
+      uint32_t cols[3] = {(count[0][j] << 2), (count[1][j] << 2) + 1, (count[2][j] << 2) + 2};
+      if (cols[0] > cols[1])
+        ImSwap(cols[0], cols[1]);
+      if (cols[1] > cols[2])
+        ImSwap(cols[1], cols[2]);
+      if (cols[0] > cols[1])
+        ImSwap(cols[0], cols[1]);
+      float heights[3];
+      uint32_t colors[3];
+      uint32_t currentColor = 0xFFFFFFFF;
+      for (int i = 0; i < 3; i++)
+      {
+        heights[i] = rmax.y - (cols[i] >> 2) * hFactor;
+        colors[i] = currentColor;
+        currentColor -= 0xFF << ((cols[i] & 3) * 8);
+      }
+
+      float currentHeight = rmax.y;
+      const float left = rmin.x + barWidth * float(j);
+      const float right = left + barWidth;
+      for (int i = 0; i < 3; i++)
+      {
+        if (heights[i] >= currentHeight)
+        {
+          continue;
+        }
+        drawList->AddRectFilled(ImVec2(left, currentHeight), ImVec2(right, heights[i]), colors[i]);
+        currentHeight = heights[i];
+      }
+    }
+  };
+};

main.cpp

@@ -37,6 +37,8 @@
 
 #include <exiv2/exiv2.hpp>
 
+#include "lib/histogram.h"
+
 struct Args : public argparse::Args {
   std::string &fpath = arg("path to the image");
 };
@@ -212,38 +214,53 @@ void RotateImage(Texture t) {
   delete[] tempBuffer;
 }
 
-Texture LoadTexture(const char * path)
-{
+Texture LoadImage(const char * path) {
     const int channelCount = 4;
     int imageFileChannelCount;
     int width, height;
     image = (uint8_t *)stbi_load(path, &width, &height, &imageFileChannelCount, channelCount);
-
-    if (image == NULL)
-    {
+    if (image == NULL) {
         fprintf(stderr, "%s\nFailed to open %s\n", stbi_failure_reason(), path);
-
         return {nullptr,{0,0}};
     }
-
     auto exif = printExifData(path);
 
+    Texture t;
+    t.size = ImVec2((float)width,(float)height);
+    t.channels = channelCount;
+    t.exif = exif;
+    return t;
+}
 
-
+Texture LoadTexture(Texture tin) {
     GLenum dataFormat = GL_RGBA;
     GLuint textureHandle;
     glGenTextures(1, &textureHandle);
     glBindTexture(GL_TEXTURE_2D, textureHandle);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, dataFormat, GL_UNSIGNED_BYTE, image);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tin.size.x, tin.size.y, 0, dataFormat, GL_UNSIGNED_BYTE, image);
 
-    Texture t;
+    Texture t = tin;
     t.texture = (void*)(uintptr_t)(textureHandle);
-    t.size = ImVec2((float)width,(float)height);
-    t.channels = channelCount;
-    t.exif = exif;
 
+    if (t.exif.ImageOrientation == "3") {
+      RotateImage(t);
+      ReloadTexture(t, t.size.x, t.size.y);
+      t = ReloadTexture(t, t.size.y, t.size.x);
+      RotateImage(t);
+      t = ReloadTexture(t, t.size.y, t.size.x);
+    } else if (t.exif.ImageOrientation == "6") {
+      RotateImage(t);
+      t = ReloadTexture(t, t.size.y, t.size.x);
+    } else if (t.exif.ImageOrientation == "8") {
+      RotateImage(t);
+      t = ReloadTexture(t, t.size.y, t.size.x);
+      RotateImage(t);
+      t = ReloadTexture(t, t.size.y, t.size.x);
+      RotateImage(t);
+      t = ReloadTexture(t, t.size.y, t.size.x);
+    }
 
     return t;
 }
@@ -254,6 +271,19 @@ const int MAX_ANNOATED_TEXELS = 10000;
 
 // Main code
 int main(int argc, char* argv[]) {
+  Texture t;
+
+  try {
+    auto args = argparse::parse<Args>(argc, argv, true);
+    t = LoadImage(args.fpath.c_str());
+    if (t.texture == nullptr) {
+      std::cerr << "failed load image" << std::endl;
+      return -1;
+    }
+  } catch (const std::runtime_error &e) {
+    std::cerr << "failed to parse arguments: " << e.what() << std::endl;
+    return -1;
+  }
   // Setup SDL
   if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_GAMECONTROLLER) !=
       0) {
@@ -266,6 +296,7 @@ int main(int argc, char* argv[]) {
   bool AA_ENABLED = true;
   bool SHOW_HELP = false;
   bool SHOW_EXIF = false;
+  bool SHOW_HISTOGRAM = false;
   int MODE = 0;
 
   // Decide GL+GLSL versions
@@ -306,9 +337,17 @@ int main(int argc, char* argv[]) {
   SDL_WindowFlags window_flags =
       (SDL_WindowFlags)(SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE |
                         SDL_WINDOW_ALLOW_HIGHDPI);
+
+
+  int wh = 800;
+  int ww = 1280;
+  if (t.size.y > t.size.x) {
+    ww = 500;
+    wh = 1280;
+  }
   SDL_Window *window =
       SDL_CreateWindow("tview", SDL_WINDOWPOS_CENTERED,
-                       SDL_WINDOWPOS_CENTERED, 1280, 720, window_flags);
+                       SDL_WINDOWPOS_CENTERED, ww, wh, window_flags);
   if (window == nullptr) {
     printf("Error: SDL_CreateWindow(): %s\n", SDL_GetError());
     return -1;
@@ -334,16 +373,11 @@ int main(int argc, char* argv[]) {
   ImGui_ImplOpenGL3_Init(glsl_version);
 
   ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
-  Texture t;
   auto flags = ImGuiTexInspect::InspectorFlags_FillVertical | ImGuiTexInspect::InspectorFlags_FillHorizontal;
 
-  try {
-    auto args = argparse::parse<Args>(argc, argv, true);
-    t = LoadTexture(args.fpath.c_str());
-  } catch (const std::runtime_error &e) {
-    std::cerr << "failed to parse arguments: " << e.what() << std::endl;
-    return -1;
-  }
+  t = LoadTexture(t);
+  Histogram histogram = Histogram(t.size.x, t.size.y, t.channels);
+  histogram.Load(image);
 
   // Main loop
   bool done = false;
@@ -390,6 +424,9 @@ int main(int argc, char* argv[]) {
             case SDL_SCANCODE_E:
               SHOW_EXIF = !SHOW_EXIF;
               break;
+            case SDL_SCANCODE_C:
+              SHOW_HISTOGRAM = !SHOW_HISTOGRAM;
+              break;
             default:
               break;
         }
@@ -497,6 +534,7 @@ int main(int argc, char* argv[]) {
         ImGui::Text("\tFloat Values");
         ImGui::Separator();
         ImGui::Text("h - show help popup");
+        ImGui::Text("c - toggle color histogram");
         ImGui::Text("e - toggle EXIF info");
         ImGui::Separator();
         ImGui::Text("q - quit");
@@ -596,6 +634,12 @@ int main(int argc, char* argv[]) {
           ImGui::TableSetColumnIndex(1);
           ImGui::Text("%sx%s", t.exif.ImageDimensionX.c_str(), t.exif.ImageDimensiony.c_str());
 
+          ImGui::TableNextRow();
+          ImGui::TableSetColumnIndex(0);
+          ImGui::Text("Orientation");
+          ImGui::TableSetColumnIndex(1);
+          ImGui::Text("%s", t.exif.ImageOrientation.c_str());
+
           ImGui::EndTable();
         }
 
@@ -623,7 +667,22 @@ int main(int argc, char* argv[]) {
 
         ImGui::End();
       }
+
+
+      if (SHOW_HISTOGRAM) {
+        ImGuiWindowClass topmost;
+        topmost.ClassId = ImHashStr("TopMost");
+        topmost.ViewportFlagsOverrideSet = ImGuiViewportFlags_TopMost;
+        ImGui::SetNextWindowClass(&topmost);
+        ImGui::Begin("Histogram", NULL, ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize  | ImGuiWindowFlags_NoFocusOnAppearing);
+        histogram.Draw();
+        ImGui::Separator();
+        ImGui::Text("Press c to hide");
+
+        ImGui::End();
       }
+    }
+
 
     // Rendering
     ImGui::Render();