Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2019-12-19 14:01:24 +03:00
parent b8e0898c7c 9564aa1fdb
commit 4c86fc13cb
16 changed files with 559 additions and 77 deletions
@@ -145,7 +145,7 @@ rgbe2float(float *red, float *green, float *blue, unsigned char rgbe[4])
 /* default minimal header. modify if you want more information in header */
 int RGBE_WriteHeader(FILE *fp, int width, int height, rgbe_header_info *info)
 {
-  const char *programtype = "RGBE";
+  const char *programtype = "RADIANCE";

  if (info && (info->valid & RGBE_VALID_PROGRAMTYPE))
    programtype = info->programtype;