Update version bitness logic and improve About dialog

Author: wkjarosz

CMakeLists.txt

@@ -126,7 +126,6 @@ list(APPEND CMD "-D" "CMAKE_SIZEOF_VOID_P=${CMAKE_SIZEOF_VOID_P}")
 list(APPEND CMD "-D" "CMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}")
 list(APPEND CMD "-D" "EMSCRIPTEN=${EMSCRIPTEN}")
 list(APPEND CMD "-D" "HDRVIEW_TARGET_ARCH=${HDRVIEW_TARGET_ARCH}")
-list(APPEND CMD "-D" "HDRVIEW_BITNESS=${HDRVIEW_BITNESS}")
 list(APPEND CMD "-P" "${CMAKE_SOURCE_DIR}/cmake/generate_version.cmake")
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/src/version.cpp ${CMAKE_CURRENT_BINARY_DIR}/src/_version.cpp

cmake/generate_version.cmake

@@ -132,6 +132,8 @@ set(VERSION_PATCH ${version_patch})
 string(TIMESTAMP BUILD_TIME "%Y-%m-%d %H:%M")
 message(STATUS "Saving build timestamp: ${BUILD_TIME}")
 
-set(VERSION_LONG "${GIT_DESCRIBE} (${HDRVIEW_BITNESS} bit)")
+# Multiply CMAKE_SIZEOF_VOID_P by 8 to get the bitness
+math(EXPR BITNESS "${CMAKE_SIZEOF_VOID_P} * 8")
+set(VERSION_LONG "${GIT_DESCRIBE} (${BITNESS} bit)")
 
 configure_file("${SRC_DIR}/version.cpp.in" "${BIN_DIR}/version.cpp" @ONLY)

src/app-gui.cpp

@@ -1101,27 +1101,36 @@ void HDRViewApp::draw_about_dialog(bool &open)
                            platform_backend, renderer_backend);
             ImGui::PopFont();
             ImGui::PopTextWrapPos();
+
+            ImGui::Spacing();
+
+            {
+                ImGui::PushTextWrapPos(0.f);
+                ImGui::PushFont(m_sans_bold, ImGui::GetStyle().FontSizeBase * 16.f / 14.f);
+                ImGui::TextUnformatted(
+                    "HDRView is a simple research-oriented tool for examining, comparing, manipulating, and "
+                    "converting high-dynamic range images.");
+                ImGui::PopFont();
+
+                ImGui::PopTextWrapPos();
+            }
+
+            ImGui::Spacing();
+
             ImGui::EndTable();
         }
 
         ImGui::Spacing();
 
         {
             ImGui::PushTextWrapPos(0.f);
-            ImGui::PushFont(m_sans_bold, ImGui::GetStyle().FontSizeBase * 16.f / 14.f);
-            ImGui::TextUnformatted(
-                "HDRView is a simple research-oriented tool for examining, comparing, manipulating, and "
-                "converting high-dynamic range images.");
-            ImGui::PopFont();
-
-            ImGui::Spacing();
-
             ImGui::TextUnformatted(
                 "It is developed by Wojciech Jarosz, and is available under a 3-clause BSD license.");
             ImGui::PopTextWrapPos();
         }
 
-        // #if 0
+        ImGui::Spacing();
+
         if (ImGui::BeginTabBar("AboutTabBar"))
         {
             if (ImGui::BeginTabItem("Keybindings", nullptr))
@@ -1180,6 +1189,8 @@ void HDRViewApp::draw_about_dialog(bool &open)
 #endif
                 ImGui::PopFont();
 
+                ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 2));
+
                 if (ImGui::PE::Begin("about_table2", 0))
                 {
                     ImGui::TableSetupColumn("one", ImGuiTableColumnFlags_WidthFixed, col_width);
@@ -1263,11 +1274,14 @@ void HDRViewApp::draw_about_dialog(bool &open)
 
                     ImGui::PE::End();
                 }
+
+                ImGui::PopStyleVar();
                 ImGui::PopTextWrapPos();
                 ImGui::EndChild();
                 ImGui::PopStyleColor();
                 ImGui::EndTabItem();
             }
+
             if (ImGui::BeginTabItem("Build info"))
             {
                 // Build the info text string for display and clipboard
@@ -1417,7 +1431,6 @@ void HDRViewApp::draw_about_dialog(bool &open)
             }
             ImGui::EndTabBar();
         }
-        // #endif
 
         if (ImGui::Button("Dismiss", EmToVec2(8.f, 0.f)) || ImGui::Shortcut(ImGuiKey_Escape) ||
             ImGui::Shortcut(ImGuiKey_Enter) || ImGui::Shortcut(ImGuiKey_Space) ||

src/image-gui.cpp

@@ -580,7 +580,7 @@ void Image::draw_info()
 
     float w = ImGui::GetContentRegionAvail().x - 1.f * (button_size.x + ImGui::GetStyle().ItemSpacing.x);
 
-    static bool expand_to_listbox = true;
+    static bool expand_to_listbox = false;
 
     auto show_view_options = [&]()
     {

src/imageio/stb.cpp

@@ -367,11 +367,6 @@ vector<ImagePtr> load_stb_image(istream &is, const string_view filename, const I
         for (int c = 0; c < size.z; ++c)
             image->channels[c].copy_from_interleaved(float_pixels.data(), size.x, size.y, size.z, c,
                                                      [](float v) { return v; });
-
-        // // then apply transfer function
-        // int num_color_channels = size.z >= 3 ? 3 : 1;
-        // to_linear(image->channels[0].data(), size.z > 1 ? image->channels[1].data() : nullptr,
-        //           size.z > 2 ? image->channels[2].data() : nullptr, size.x * size.y, num_color_channels, tf, 1);
     }
     spdlog::debug("Copying image channels took: {} seconds.", (timer.elapsed() / 1000.f));