Enhance PSD metadata extraction and UI table styling

wkjarosz · wkjarosz · commit 8b8f7a19b81b · 2026-01-14T01:28:19.000-05:00
Refactored PSD metadata extraction into a PSDMetadata struct with support for additional fields (ICC, IPTC, copyright, URL, etc.) and improved logging. Updated image loading to use the new metadata structure and ICC profile handling. Improved ImGui table and text rendering by tightening cell and frame padding. Minor fixes in EXIF error handling and PNG color profile assignment.
diff --git a/src/image_gui.cpp b/src/image_gui.cpp
@@ -399,8 +399,7 @@ void Image::draw_info()
             ImGui::PE::WrappedText(property_name, value, tooltip, bold_font);
     };
 
-    static const ImGuiTableFlags table_flags =
-        ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersInnerH | ImGuiTableFlags_NoBordersInBodyUntilResize;
+    static const ImGuiTableFlags table_flags = ImGuiTableFlags_Resizable | ImGuiTableFlags_NoBordersInBodyUntilResize;
 
     auto get_tooltip = [](const json &field_obj)
     {
@@ -624,13 +623,15 @@ void Image::draw_info()
         {
             draw_filter_input();
             ImGui::BeginChild("Header info child", ImVec2(0, 0), ImGuiChildFlags_None, ImGuiWindowFlags_NoBackground);
+            ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));
             if (ImGui::PE::Begin("Image info", table_flags))
             {
                 ImGui::Indent(HelloImGui::EmSize(0.5f));
                 add_fields(metadata["header"]);
                 ImGui::Unindent(HelloImGui::EmSize(0.5f));
             }
             ImGui::PE::End();
+            ImGui::PopStyleVar();
             ImGui::EndChild();
             ImGui::EndTabItem();
         }
@@ -657,13 +658,15 @@ void Image::draw_info()
                 ImGui::PopStyleColor(1);
                 if (open)
                 {
+                    ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));
                     if (ImGui::PE::Begin("Image info", table_flags))
                     {
                         ImGui::Indent(HelloImGui::EmSize(0.5f));
                         add_fields(table_obj);
                         ImGui::Unindent(HelloImGui::EmSize(0.5f));
                     }
                     ImGui::PE::End();
+                    ImGui::PopStyleVar();
                 }
             }
             ImGui::EndChild();
@@ -732,13 +735,15 @@ void Image::draw_info()
 
                 if (open)
                 {
+                    ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));
                     if (ImGui::PE::Begin("Image info", table_flags))
                     {
                         // ImGui::Indent(HelloImGui::EmSize(0.5f));
                         add_xmp_fields(table_obj, 0, name + " " + ns);
                         // ImGui::Unindent(HelloImGui::EmSize(0.5f));
                     }
                     ImGui::PE::End();
+                    ImGui::PopStyleVar();
                 }
 
                 // if (open)
@@ -1186,8 +1191,7 @@ void Image::draw_colorspace()
 
     float                        col2_w          = 0.f;
     float                        col2_big_enough = HelloImGui::EmSize(12.f);
-    static const ImGuiTableFlags table_flags =
-        ImGuiTableFlags_Resizable | ImGuiTableFlags_BordersInnerH | ImGuiTableFlags_NoBordersInBodyUntilResize;
+    static const ImGuiTableFlags table_flags = ImGuiTableFlags_Resizable | ImGuiTableFlags_NoBordersInBodyUntilResize;
     if (ImGui::PE::Begin("Colorspace", table_flags))
     {
         ImGui::Indent(HelloImGui::EmSize(0.5f));
diff --git a/src/imageio/exif.cpp b/src/imageio/exif.cpp
@@ -174,17 +174,17 @@ Exif::Exif(const uint8_t *data_ptr, size_t data_size) : m_impl(std::make_unique<
             [](ExifLog *log, ExifLogCode kind, const char *domain, const char *format, va_list args, void *user_data)
             {
                 bool *error = static_cast<bool *>(user_data);
-                char  buf[1024];
-                vsnprintf(buf, sizeof(buf), format, args);
+                char  msg[1024];
+                vsnprintf(msg, sizeof(msg), format, args);
 
                 switch (kind)
                 {
-                case EXIF_LOG_CODE_NONE: spdlog::info("{}: {}", domain, buf); break;
-                case EXIF_LOG_CODE_DEBUG: spdlog::debug("{}: {}", domain, buf); break;
+                case EXIF_LOG_CODE_NONE: spdlog::info("{}: {}", domain, msg); break;
+                case EXIF_LOG_CODE_DEBUG: spdlog::debug("{}: {}", domain, msg); break;
                 case EXIF_LOG_CODE_NO_MEMORY:
                 case EXIF_LOG_CODE_CORRUPT_DATA:
                     *error = true;
-                    spdlog::error("log: {}: {}", domain, buf);
+                    spdlog::error("log: {}: {}", domain, msg);
                     break;
                 }
             },
@@ -195,7 +195,10 @@ Exif::Exif(const uint8_t *data_ptr, size_t data_size) : m_impl(std::make_unique<
         // 3) Load the EXIF data from memory buffer
         exif_data_load_data(m_impl->exif_data.get(), m_impl->data.data(), m_impl->data.size());
 
-        if (!m_impl->exif_data || error)
+        if (error)
+            spdlog::warn("There were errors while loading EXIF data, but trying to continue.");
+
+        if (!m_impl->exif_data)
             throw std::invalid_argument{"Failed to decode EXIF data."};
     }
     catch (const std::exception &e)
diff --git a/src/imageio/png.cpp b/src/imageio/png.cpp
@@ -779,10 +779,10 @@ vector<ImagePtr> load_png_image(istream &is, string_view filename, const ImageLo
             }
             else
                 spdlog::info("Image is already in linear color space.");
-
-            image->metadata["color profile"] = profile_desc;
         }
 
+        image->metadata["color profile"] = profile_desc;
+
         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; });
diff --git a/src/imageio/psd.cpp b/src/imageio/psd.cpp
@@ -36,7 +36,12 @@ static std::vector<uint8_t> read_bytes(std::istream &stream, size_t count)
     return data;
 }
 
-void extract_psd_exif_xmp(std::istream &stream, std::vector<uint8_t> &exif, std::vector<uint8_t> &xmp)
+const char *PSDMetadata::color_mode_names[10] = {
+    "Bitmap", "Grayscale", "Indexed", "RGB", "CMYK", "Invalid5", "Invalid6", "Multichannel", "Duotone", "Lab",
+};
+
+// See https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/
+void PSDMetadata::read(std::istream &stream)
 {
     // Read and verify PSD signature
     char signature[4];
@@ -52,8 +57,12 @@ void extract_psd_exif_xmp(std::istream &stream, std::vector<uint8_t> &exif, std:
     // Skip reserved bytes (6 bytes) - must be zero
     skip_bytes(stream, 6);
 
-    // Skip channels (2), height (4), width (4), depth (2), color mode (2) = 14 bytes
-    skip_bytes(stream, 14);
+    // Channels (2), height (4), width (4), depth (2), color mode (2) = 14 bytes
+    num_channels = read_uint16_be(stream);
+    height       = read_uint32_be(stream);
+    width        = read_uint32_be(stream);
+    depth        = read_uint16_be(stream);
+    color_mode   = static_cast<ColorMode>(read_uint16_be(stream));
 
     // Read and skip Color Mode Data section
     uint32_t color_mode_data_length = read_uint32_be(stream);
@@ -107,20 +116,52 @@ void extract_psd_exif_xmp(std::istream &stream, std::vector<uint8_t> &exif, std:
         if (data_size > 100 * 1024 * 1024) // 100MB limit
             throw std::runtime_error("Resource data size too large");
 
-        // Check if this is EXIF or XMP
-        if (resource_id == 1058 && exif.empty()) // EXIF (0x0422 in hex)
+        // Extract metadata based on resource ID
+        if (resource_id == 1028 && iptc.empty()) // IPTC-NAA
+            iptc = read_bytes(stream, data_size);
+        else if (resource_id == 1034) // Copyright flag
+        {
+            if (data_size > 0)
+            {
+                uint8_t flag;
+                stream.read(reinterpret_cast<char *>(&flag), 1);
+                is_copyright = (flag != 0);
+                skip_bytes(stream, data_size - 1);
+            }
+        }
+        else if (resource_id == 1035) // URL
+        {
+            if (data_size > 0)
+            {
+                auto url_data = read_bytes(stream, data_size);
+                url           = std::string(url_data.begin(), url_data.end());
+            }
+        }
+        else if (resource_id == 1039 && icc_profile.empty()) // ICC Profile
+            icc_profile = read_bytes(stream, data_size);
+        else if (resource_id == 1041) // ICC Untagged
+        {
+            if (data_size >= 1)
+            {
+                uint8_t flag;
+                stream.read(reinterpret_cast<char *>(&flag), 1);
+                is_icc_untagged = (flag != 0);
+                skip_bytes(stream, data_size - 1);
+            }
+        }
+        else if (resource_id == 1036 && thumbnail.empty()) // Thumbnail
+            thumbnail = read_bytes(stream, data_size);
+        else if (resource_id == 1058 && exif.empty()) // EXIF data 1
             exif = read_bytes(stream, data_size);
+        else if (resource_id == 1059 && exif3.empty()) // EXIF data 3
+            exif3 = read_bytes(stream, data_size);
         else if (resource_id == 1060 && xmp.empty()) // XMP (0x0424 in hex)
             xmp = read_bytes(stream, data_size);
-        else // Skip this resource data
+        else
             skip_bytes(stream, data_size);
 
         // Resource data is padded to even length
         if (data_size % 2 == 1)
             skip_bytes(stream, 1);
-
-        // Early exit if we found both
-        if (!exif.empty() && !xmp.empty())
-            break;
     }
 }
diff --git a/src/imageio/psd.h b/src/imageio/psd.h
@@ -2,4 +2,37 @@
 #include <iostream>
 #include <vector>
 
-void extract_psd_exif_xmp(std::istream &stream, std::vector<uint8_t> &exif, std::vector<uint8_t> &xmp);
+struct PSDMetadata
+{
+    uint16_t num_channels = uint16_t(-1); // Supported range is 1 to 56.
+    uint32_t width        = uint32_t(-1); // Supported range is 1 to 30,000. (PSB max of 300,000.)
+    uint32_t height       = uint32_t(-1); // Supported range is 1 to 30,000. (PSB max of 300,000.)
+    uint16_t depth        = uint16_t(-1); // Supported values are 1, 8, 16 and 32.
+    enum ColorMode : uint16_t
+    {
+        Bitmap       = 0,
+        Grayscale    = 1,
+        Indexed      = 2,
+        RGB          = 3,
+        CMYK         = 4,
+        Multichannel = 7,
+        Duotone      = 8,
+        Lab          = 9,
+        NotSet       = uint16_t(-1),
+    };
+    // Image properties
+    ColorMode color_mode = NotSet;
+
+    static const char *color_mode_names[10];
+
+    // Metadata blocks
+    std::vector<uint8_t> exif, exif3, xmp, iptc, icc_profile, thumbnail;
+
+    // Flags
+    uint8_t is_copyright    = uint8_t(-1); // arbitrary value meaning "not set"
+    uint8_t is_icc_untagged = uint8_t(-1); // arbitrary value meaning "not set"
+
+    std::string url;
+
+    void read(std::istream &stream);
+};
diff --git a/src/imageio/stb.cpp b/src/imageio/stb.cpp
diff --git a/src/imgui_ext.cpp b/src/imgui_ext.cpp

Original file line number	Diff line number	Diff line change
`@@ -399,8 +399,7 @@ void Image::draw_info()`
`399`	`399`	`ImGui::PE::WrappedText(property_name, value, tooltip, bold_font);`
`400`	`400`	`};`
`401`	`401`
`402`		`- static const ImGuiTableFlags table_flags =`
`403`		`- ImGuiTableFlags_Resizable \| ImGuiTableFlags_BordersInnerH \| ImGuiTableFlags_NoBordersInBodyUntilResize;`
	`402`	`+ static const ImGuiTableFlags table_flags = ImGuiTableFlags_Resizable \| ImGuiTableFlags_NoBordersInBodyUntilResize;`
`404`	`403`
`405`	`404`	`auto get_tooltip = [](const json &field_obj)`
`406`	`405`	`{`
`@@ -624,13 +623,15 @@ void Image::draw_info()`
`624`	`623`	`{`
`625`	`624`	`draw_filter_input();`
`626`	`625`	`ImGui::BeginChild("Header info child", ImVec2(0, 0), ImGuiChildFlags_None, ImGuiWindowFlags_NoBackground);`
	`626`	`+ ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));`
`627`	`627`	`if (ImGui::PE::Begin("Image info", table_flags))`
`628`	`628`	`{`
`629`	`629`	`ImGui::Indent(HelloImGui::EmSize(0.5f));`
`630`	`630`	`add_fields(metadata["header"]);`
`631`	`631`	`ImGui::Unindent(HelloImGui::EmSize(0.5f));`
`632`	`632`	`}`
`633`	`633`	`ImGui::PE::End();`
	`634`	`+ ImGui::PopStyleVar();`
`634`	`635`	`ImGui::EndChild();`
`635`	`636`	`ImGui::EndTabItem();`
`636`	`637`	`}`
`@@ -657,13 +658,15 @@ void Image::draw_info()`
`657`	`658`	`ImGui::PopStyleColor(1);`
`658`	`659`	`if (open)`
`659`	`660`	`{`
	`661`	`+ ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));`
`660`	`662`	`if (ImGui::PE::Begin("Image info", table_flags))`
`661`	`663`	`{`
`662`	`664`	`ImGui::Indent(HelloImGui::EmSize(0.5f));`
`663`	`665`	`add_fields(table_obj);`
`664`	`666`	`ImGui::Unindent(HelloImGui::EmSize(0.5f));`
`665`	`667`	`}`
`666`	`668`	`ImGui::PE::End();`
	`669`	`+ ImGui::PopStyleVar();`
`667`	`670`	`}`
`668`	`671`	`}`
`669`	`672`	`ImGui::EndChild();`
`@@ -732,13 +735,15 @@ void Image::draw_info()`
`732`	`735`
`733`	`736`	`if (open)`
`734`	`737`	`{`
	`738`	`+ ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));`
`735`	`739`	`if (ImGui::PE::Begin("Image info", table_flags))`
`736`	`740`	`{`
`737`	`741`	`// ImGui::Indent(HelloImGui::EmSize(0.5f));`
`738`	`742`	`add_xmp_fields(table_obj, 0, name + " " + ns);`
`739`	`743`	`// ImGui::Unindent(HelloImGui::EmSize(0.5f));`
`740`	`744`	`}`
`741`	`745`	`ImGui::PE::End();`
	`746`	`+ ImGui::PopStyleVar();`
`742`	`747`	`}`
`743`	`748`
`744`	`749`	`// if (open)`
`@@ -1186,8 +1191,7 @@ void Image::draw_colorspace()`
`1186`	`1191`
`1187`	`1192`	`float col2_w = 0.f;`
`1188`	`1193`	`float col2_big_enough = HelloImGui::EmSize(12.f);`
`1189`		`- static const ImGuiTableFlags table_flags =`
`1190`		`- ImGuiTableFlags_Resizable \| ImGuiTableFlags_BordersInnerH \| ImGuiTableFlags_NoBordersInBodyUntilResize;`
	`1194`	`+ static const ImGuiTableFlags table_flags = ImGuiTableFlags_Resizable \| ImGuiTableFlags_NoBordersInBodyUntilResize;`
`1191`	`1195`	`if (ImGui::PE::Begin("Colorspace", table_flags))`
`1192`	`1196`	`{`
`1193`	`1197`	`ImGui::Indent(HelloImGui::EmSize(0.5f));`
Original file line number	Diff line number	Diff line change
`@@ -779,10 +779,10 @@ vector<ImagePtr> load_png_image(istream &is, string_view filename, const ImageLo`
`779`	`779`	`}`
`780`	`780`	`else`
`781`	`781`	`spdlog::info("Image is already in linear color space.");`
`782`		`-`
`783`		`- image->metadata["color profile"] = profile_desc;`
`784`	`782`	`}`
`785`	`783`
	`784`	`+ image->metadata["color profile"] = profile_desc;`
	`785`	`+`
`786`	`786`	`for (int c = 0; c < size.z; ++c)`
`787`	`787`	`image->channels[c].copy_from_interleaved(float_pixels.data(), size.x, size.y, size.z, c,`
`788`	`788`	`[](float v) { return v; });`