Merge pull request #2148 from JeromeMartinez/PNG_cLLI

PNG: adapt cLLi/mdCv letter case
MediaArea · Nov 26, 2024 · 9d2dcd1 · 9d2dcd1
2 parents 6c07ebf + 5c2bd4e
commit 9d2dcd1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/Source/MediaInfo/Image/File_Png.cpp b/Source/MediaInfo/Image/File_Png.cpp
@@ -90,10 +90,12 @@ namespace Elements
     const int32u IHDR=0x49484452;
     const int32u PLTE=0x506C5445;
     const int32u cICP=0x63494350;
+    const int32u cLLI=0x634C4C49;
     const int32u cLLi=0x634C4C69;
     const int32u gAMA=0x67414D41;
     const int32u iCCP=0x69434350;
     const int32u iTXt=0x69545874;
+    const int32u mDCV=0x6D444356;
     const int32u mDCv=0x6D444376;
     const int32u pHYs=0x70485973;
     const int32u sBIT=0x73424954;
@@ -255,10 +257,12 @@ void File_Png::Data_Parse()
         CASE_INFO(IHDR,                                         "Image header");
         CASE_INFO(PLTE,                                         "Palette table");
         CASE_INFO(cICP,                                         "Coding-independent code points");
+        CASE_INFO(cLLI,                                         "Content Light Level Information");
         CASE_INFO(cLLi,                                         "Content Light Level Information");
         CASE_INFO(gAMA,                                         "Gamma");
         CASE_INFO(iCCP,                                         "Embedded ICC profile");
         CASE_INFO(iTXt,                                         "International textual data");
+        CASE_INFO(mDCV,                                         "Mastering Display Color Volume");
         CASE_INFO(mDCv,                                         "Mastering Display Color Volume");
         CASE_INFO(pHYs,                                         "Physical pixel dimensions");
         CASE_INFO(sBIT,                                         "Significant bits");
@@ -373,7 +377,7 @@ void File_Png::cICP()
 }
 
 //---------------------------------------------------------------------------
-void File_Png::cLLi()
+void File_Png::cLLI()
 {
     //Parsing
     Ztring MaxCLL, MaxFALL;
@@ -473,7 +477,7 @@ void File_Png::iCCP()
 }
 
 //---------------------------------------------------------------------------
-void File_Png::mDCv()
+void File_Png::mDCV()
 {
     Ztring MasteringDisplay_ColorPrimaries, MasteringDisplay_Luminance;
     Get_MasteringDisplayColorVolume(MasteringDisplay_ColorPrimaries, MasteringDisplay_Luminance);

diff --git a/Source/MediaInfo/Image/File_Png.h b/Source/MediaInfo/Image/File_Png.h
@@ -65,11 +65,13 @@ private :
     void IHDR();
     void PLTE() {Skip_XX(Element_Size, "Data");}
     void cICP();
-    void cLLi();
+    void cLLI();
+    void cLLi() { cLLi(); }
     void iCCP();
     void iTXt() {Textual(bitset8().set(IsCompressed).set(IsUTF8));}
     void gAMA();
-    void mDCv();
+    void mDCV();
+    void mDCv() { mDCV(); }
     void pHYs();
     void sBIT();
     void tEXt() {Textual(bitset8());}