Added support for BMP images saved by GIMP 2.10.22 with color space i…

…nfo. (compression method = 3)
NagyD · Nov 15, 2020 · 8b5194d · 8b5194d
1 parent 2712ff3
commit 8b5194d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/doc/changelog.txt b/doc/changelog.txt
@@ -15,6 +15,12 @@ This program is open source under the GNU General Public License terms.
 x See todo.txt for future plans.
 -------------------------------------------------
 
+-------------------------------------------------
+upcoming version (no release date yet)
+-------------------------------------------------
+- Made the highest compression level the default.
+- Added support for BMP images saved by GIMP 2.10.22 with color space info. (compression method = 3)
+
 -------------------------------------------------
 PR v1.3.1 (released 2018-05-12)
 -------------------------------------------------

diff --git a/src/lib/formats/bmp.c b/src/lib/formats/bmp.c
@@ -150,7 +150,8 @@ int readBmp(const char* file, unsigned char** data, int *ph, int *pw,  int *pbit
 		/* info header */
 	ok=ok&&freadlong(&aux      ,bitmap);
 /* http://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29 */
-/* GIMP saves 108 byte headers by default */
+/* GIMP saves 108-byte headers by default (if color space info is enabled) */
+/* 124-byte headers since GIMP 2.10.22 */
 	ok=ok&&(aux>=40);
         headersize=aux;
 	ok=ok&&freadlong(&width    ,bitmap);
@@ -159,7 +160,12 @@ int readBmp(const char* file, unsigned char** data, int *ph, int *pw,  int *pbit
 	ok=ok&&(aux==1);
 	ok=ok&&freadshort(&bits    ,bitmap);
 	ok=ok&&freadlong(&aux      ,bitmap);    /* Compression type (0=none)   */
-	if (ok&&aux!=0) { fclose(bitmap); return -1; /* PR_NO_COMPRESS_SUPPORT */ }
+	/* 0 means no compression, 3 is used in files saved by GIMP 2.10.22 with color space info. */
+	if (ok&&aux!=0 && aux!=3) {
+		printf("Error: BMP uses an unknown compression method: %lu\n", aux);
+		fclose(bitmap);
+		return -1; /* PR_NO_COMPRESS_SUPPORT */
+	}
 	ok=ok&&freadlong(&aux      ,bitmap);    /* Image size in bytes (junk)  */
 	ok=ok&&freadlong(&aux      ,bitmap);    /* Pixels per meter x (junk)   */
 	ok=ok&&freadlong(&aux      ,bitmap);    /* Pixels per meter y (junk)   */