Ansariel 40b731eb76 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 ... # Conflicts: # .gitignore # indra/cmake/FindOpenJPEG.cmake # indra/cmake/FreeType.cmake # indra/cmake/OpenJPEG.cmake # indra/cmake/UI.cmake # indra/cmake/ViewerMiscLibs.cmake # indra/llwindow/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py		2023-03-21 10:57:56 +01:00
..
CMakeLists.txt	Revert "Linux: Stop GCC complaining about deprecated functions in target llimagej2coj"	2023-02-05 18:34:46 +11:00
llimagej2coj.cpp	Openjpeg: Deprecation warning fix - dont set bpp in cmptparm when calling opj_image_create() as it is deprecated in favor of setting prec instead, remove redundant setting of bpp to squelch the warning	2023-02-05 19:18:18 +11:00
llimagej2coj.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00