From: Dan Brown <redacted>
Date: Thu, 9 Feb 2023 15:14:41 +0000 (+0000)
Subject: Got favicons better supported, can't get transparency right
X-Git-Tag: v23.02~1^2~18^2~3
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/2845e0003ed3a7960257ef19b139627ee69523dc

Got favicons better supported, can't get transparency right

Digging deeper, I don't think PHPGD supports 32bit bmp output which
complicates matters.
---

diff --git a/app/Uploads/FaviconHandler.php b/app/Uploads/FaviconHandler.php
index f61e7ae64..39f8b12ca 100644
--- a/app/Uploads/FaviconHandler.php
+++ b/app/Uploads/FaviconHandler.php
@@ -28,6 +28,8 @@ class FaviconHandler
         $bmpData = $image->encode('bmp');
         $icoData = $this->bmpToIco($bmpData, 32, 32);
 
+//        file_put_contents(public_path('icon.bmp'), $bmpData);
+//        file_put_contents(public_path('icon-test.png'), $image->encode('png'));
         file_put_contents($targetPath, $icoData);
     }
 
@@ -54,6 +56,9 @@ class FaviconHandler
     {
         // Trim off the header of the bitmap file
         $rawBmpData = substr($bmpData, 14);
+        // Double the height in the "BITMAPINFOHEADER" since, when in an ICO file, half
+        // of the image data is expected to be a mask.
+        $rawBmpData[8] = hex2bin(dechex($height * 2));
 
         // ICO header
         $header = pack('v', 0x00); // Reserved. Must always be 0
@@ -66,17 +71,23 @@ class FaviconHandler
         $entry .= "\0"; // Color palette, typically 0
         $entry .= "\0"; // Reserved
 
+        // AND mask
+//        $pxCount = $width * $height;
+//        $pxMask = hex2bin('00000000');
+//        $mask = str_repeat($pxMask, $pxCount);
+        $mask = '';
+
         // Color planes, Appears to remain 1 for bmp image data
         $entry .= pack('v', 0x01);
         // Bits per pixel, can range from 1 to 32. From testing conversion
-        // via intervention from png typically provides this as 32.
-        $entry .= pack('v', 0x20);
+        // via intervention from png typically provides this as 24.
+        $entry .= pack('v', 0x18);
         // Size of the image data in bytes
-        $entry .= pack('V', strlen($rawBmpData));
+        $entry .= pack('V', strlen($rawBmpData) + strlen($mask));
         // Offset of the bmp data from file start
         $entry .= pack('V', strlen($header) + strlen($entry) + 4);
 
         // Join & return the combined parts of the ICO image data
-        return $header . $entry . $rawBmpData;
+        return $header . $entry . $rawBmpData . $mask;
     }
 }
diff --git a/public/favicon.ico b/public/favicon.ico
index e047657cc..e11483117 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ