Skip to content

Commit 547a241

Browse files
committed
Update FreeImage codec handling
Advance FreeImageRe to the zlib install-libdir fix. Add DNG to the FreeImage extension list and map FIT_RGB16 48-bit images to the 16-bit RGB texel format.
1 parent 4cc142d commit 547a241

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

Codecs/CodecFreeImage/Source/CodecFreeImage.h

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace IMCodec
2525

2626
,{ LLUTILS_TEXT("BMP"),LLUTILS_TEXT("ICO"),LLUTILS_TEXT("JNG"),LLUTILS_TEXT("KOALA"),LLUTILS_TEXT("LBM"),LLUTILS_TEXT("IFF"),LLUTILS_TEXT("MNG"),LLUTILS_TEXT("PBM"),LLUTILS_TEXT("PBMRAW"),LLUTILS_TEXT("PCD"),LLUTILS_TEXT("PCX"),LLUTILS_TEXT("PGM"),LLUTILS_TEXT("PGMRAW")
2727
,LLUTILS_TEXT("PPM"),LLUTILS_TEXT("PPMRAW"),LLUTILS_TEXT("RAS"),LLUTILS_TEXT("TGA"),LLUTILS_TEXT("WBMP"),LLUTILS_TEXT("PSD"),LLUTILS_TEXT("CUT"),LLUTILS_TEXT("XBM"),LLUTILS_TEXT("XPM"),LLUTILS_TEXT("DDS"),LLUTILS_TEXT("GIF")
28-
,LLUTILS_TEXT("HDR"),LLUTILS_TEXT("SGI"),LLUTILS_TEXT("PFM"),LLUTILS_TEXT("PICT"),LLUTILS_TEXT("RAW"),LLUTILS_TEXT("JXR")
28+
,LLUTILS_TEXT("HDR"),LLUTILS_TEXT("SGI"),LLUTILS_TEXT("PFM"),LLUTILS_TEXT("PICT"),LLUTILS_TEXT("DNG"),LLUTILS_TEXT("RAW"),LLUTILS_TEXT("JXR")
2929
}
3030
}
3131
}
@@ -100,6 +100,14 @@ namespace IMCodec
100100

101101
}
102102
}
103+
case FIT_RGB16:
104+
switch (header.biBitCount)
105+
{
106+
case 48:
107+
imageItem->descriptor.texelFormatDecompressed = TexelFormat::I_R16_G16_B16;
108+
break;
109+
}
110+
103111
break;
104112
default:
105113
LL_EXCEPTION_NOT_IMPLEMENT("Decoding the type of texture is yet to be implemented.");

External/FreeImageRe

0 commit comments

Comments
 (0)