histogram works, we are basically at a 0.9 release

lib/histogram.h

@@ -5,36 +5,29 @@
 class Histogram {
 
 public:
-  unsigned int **counts = nullptr;
+  unsigned int count[4][256] = {0};
-  int width = 0;
+  int width;
-  int height = 0;
+  int height;
-  int channels = 0;
+  int channels;
 
-  Histogram(); 
+  Histogram(int width, int height, int channels) {
-
+    this->width = width;
-  void Load() {
+    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() {
-
-  };
-  
-};
-
-inline void histogram(const int width, const int height, const int channels, const unsigned char* const bits) {
-  unsigned int count[4][256] = {0};
-
-  const unsigned char* ptrCols = bits;
-
     ImGui::InvisibleButton("histogram", ImVec2(512, 256));
-  for (int l = 0; l < height * width; l++)
-  {
-    count[0][*ptrCols++]++;
-    count[1][*ptrCols++]++;
-    count[2][*ptrCols++]++;
-    count[3][*ptrCols++]++;
-  }
 
     unsigned int maxv = count[0][0];
     unsigned int* pCount = &count[0][0];
@@ -91,4 +84,5 @@ inline void histogram(const int width, const int height, const int channels, con
         currentHeight = heights[i];
       }
     }
-}
+  };
+};

main.cpp

@@ -214,35 +214,35 @@ 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);
@@ -271,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) {
@@ -283,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
@@ -323,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;
@@ -351,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 {
+  t = LoadTexture(t);
-    auto args = argparse::parse<Args>(argc, argv, true);
+  Histogram histogram = Histogram(t.size.x, t.size.y, t.channels);
-    t = LoadTexture(args.fpath.c_str());
+  histogram.Load(image);
-  } catch (const std::runtime_error &e) {
-    std::cerr << "failed to parse arguments: " << e.what() << std::endl;
-    return -1;
-  }
 
   // Main loop
   bool done = false;
@@ -407,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;
         }
@@ -514,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");
@@ -646,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();