textures: Introduce support for tiff using libtiff v4.7.0 and reintroduce support for pgm, ppm and psd using stb_image

Author: joel16

app/Makefile

@@ -14,7 +14,8 @@ VERSION_MAJOR :=  4
 VERSION_MINOR :=  1
 VERSION_MICRO :=  2
 
-INCDIR   = ../libs/ ../libs/include ../libs/libnsbmp ../libs/libnsgif ../libs/include/opus include
+INCDIR   = ../libs/ ../libs/include ../libs/include/libtiff ../libs/libnsbmp ../libs/libnsgif \
+           ../libs/include/opus include
 CFLAGS   = -Os -mno-gpopt -Wall -ffast-math -Wno-narrowing -Wno-unused-variable \
            -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO)
 CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti -std=gnu++17
@@ -25,7 +26,7 @@ BUILD_PRX = 1
 LIBDIR  = ../libs/lib
 LDFLAGS =
 LIBS    = -lintrafont -lglib2d -lxmp -lmpg123 -lvorbisfile -lvorbis -lopusfile -lopus -lFLAC -logg \
-          -larchive -lbz2 -llzma -lturbojpeg -ljpeg -lpng16 -lstdc++ -lz \
+          -larchive -ltiff -lbz2 -llzma -lturbojpeg -ljpeg -lpng16 -lstdc++ -lz \
           -lpspkubridge -lpspsystemctrl_user -lpspusbdevice \
           -lpspgu -lpspvram -lpspaudio -lpsppower -lpspreg -lpspusb -lpspusbstor -lpspumd
 

app/source/fs.cpp

@@ -123,7 +123,7 @@ namespace FS {
         else if ((strncasecmp(ext, "bmp", 3) == 0) || (strncasecmp(ext, "gif", 3) == 0) || (strncasecmp(ext, "jpg", 3) == 0)
             || (strncasecmp(ext, "jpeg", 4) == 0) || (strncasecmp(ext, "pgm", 3) == 0) || (strncasecmp(ext, "ppm", 3) == 0)
             || (strncasecmp(ext, "png", 3) == 0) || (strncasecmp(ext, "psd", 3) == 0) || (strncasecmp(ext, "tga", 3) == 0)
-            || (strncasecmp(ext, "webp", 4) == 0)) {
+            || (strncasecmp(ext, "tif", 3) == 0) || (strncasecmp(ext, "tiff", 4) == 0)) {
                 return FileTypeImage;
         }
         else if ((strncasecmp(ext, "cfg", 3) == 0) || (strncasecmp(ext, "conf", 4) == 0) || (strncasecmp(ext, "ini", 3) == 0)

app/source/textures.cpp

@@ -8,6 +8,25 @@
 #include "libnsbmp.h"
 #include "nsgif.h"
 #include "log.h"
+
+// STB
+#define STB_IMAGE_IMPLEMENTATION
+#define STBI_NO_STDIO
+#define STBI_NO_BMP
+#define STBI_NO_GIF
+#define STBI_NO_HDR
+#define STBI_NO_JPEG
+#define STBI_NO_PIC
+#define STBI_NO_PNG
+#define STBI_ONLY_PNM
+#define STBI_ONLY_PSD
+#define STBI_ONLY_TGA
+#include "stb_image.h"
+
+// TIFF
+#include "tiffio.h"
+#include "tiffiop.h"
+
 #include "textures.h"
 #include "utils.h"
 
@@ -240,30 +259,99 @@ namespace Textures {
         return tex;
     }
 
-    g2dTexture *LoadImage(const std::string &path, int size) {
-        int ret = 0;
-        unsigned char *data = static_cast<unsigned char *>(std::malloc(size));
-
-        if (R_FAILED(ret = FS::ReadFile(path, data, size))) {
-            Log::Error("%s(FS::ReadFile) failed: 0x%08x\n", __func__, ret);
-            std::free(data);
+    static g2dTexture *LoadImageBuffer(const unsigned char *data, int size) {
+        int width = 0, height = 0, channels = 0;
+        g2dTexture *tex = nullptr;
+        
+        unsigned char *img = stbi_load_from_memory(data, size, &width, &height, &channels, STBI_rgb_alpha);
+        
+        if (!img) {
+            Log::Error("%s(stbi_load_from_memory) failed: %s\n", __func__, stbi_failure_reason());
             return nullptr;
         }
+        
+        if (width > 512 || height > 512) {
+            Log::Error("%s g2d does not support images greater than 512x512\n", __func__);
+            stbi_image_free(img);
+            return nullptr;
+        }
+        
+        tex = g2dTexLoad(img, width, height, G2D_SWIZZLE);
+        stbi_image_free(img);
+        return tex;
+    }
 
+    static g2dTexture *LoadImageTIFF(const std::string &path) {
+        TIFF *tif = TIFFOpen(path.c_str(), "r");
         g2dTexture *tex = nullptr;
-        const char *ext = FS::GetFileExt(path.c_str());
 
-        if (strncasecmp(ext, "bmp", 3) == 0) {
-            tex = Textures::LoadImageBufferBMP(data, size);
+        if (tif) {
+            std::size_t pixelCount = 0;
+            u32 *raster = nullptr;
+            int width = 0, height = 0;
+            
+            TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &width);
+            TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &height);
+            pixelCount = width * height;
+            
+            raster = (u32 *)_TIFFCheckMalloc(tif, pixelCount, sizeof(u32), "raster buffer");
+            if (raster != nullptr) {
+                if (TIFFReadRGBAImageOriented(tif, width, height, raster, ORIENTATION_TOPLEFT)) {
+                    tex = g2dTexLoad(reinterpret_cast<unsigned char*>(raster), width, height, G2D_SWIZZLE);
+                    _TIFFfree(raster);
+                }
+                else {
+                    Log::Error("%s(TIFFReadRGBAImage) failed\n", __func__);
+                }
+
+            }
+            else {
+                Log::Error("%s(_TIFFmalloc) failed\n", __func__);
+            }
+
+            TIFFClose(tif);
+            return tex;
         }
-        else if (strncasecmp(ext, "gif", 3) == 0) {
-            tex = Textures::LoadImageBufferGIF(data, size);
+        else {
+            Log::Error("%s(TIFFOpen) failed\n", __func__);
         }
-        else if ((strncasecmp(ext, "jpeg", 4) == 0) || (strncasecmp(ext, "jpg", 3) == 0)) {
-            tex = Textures::LoadImageBufferJPEG(data, size);
+        
+        return tex;
+    }
+
+    g2dTexture *LoadImage(const std::string &path, int size) {
+        int ret = 0;
+        unsigned char *data = static_cast<unsigned char *>(std::malloc(size));
+
+        g2dTexture *tex = nullptr;
+        const char *ext = FS::GetFileExt(path.c_str());
+
+        if ((strncasecmp(ext, "tif", 3) == 0) || (strncasecmp(ext, "tiff", 4) == 0)) {
+            tex = Textures::LoadImageTIFF(path);
         }
-        else if (strncasecmp(ext, "png", 3) == 0) {
-            tex = Textures::LoadImageBufferPNG(data, size);
+        else {
+            if (R_FAILED(ret = FS::ReadFile(path, data, size))) {
+                Log::Error("%s(FS::ReadFile) failed: 0x%08x\n", __func__, ret);
+                std::free(data);
+                return nullptr;
+            }
+    
+            if (strncasecmp(ext, "bmp", 3) == 0) {
+                tex = Textures::LoadImageBufferBMP(data, size);
+            }
+            else if (strncasecmp(ext, "gif", 3) == 0) {
+                tex = Textures::LoadImageBufferGIF(data, size);
+            }
+            else if ((strncasecmp(ext, "jpeg", 4) == 0) || (strncasecmp(ext, "jpg", 3) == 0)) {
+                tex = Textures::LoadImageBufferJPEG(data, size);
+            }
+            else if (strncasecmp(ext, "png", 3) == 0) {
+                tex = Textures::LoadImageBufferPNG(data, size);
+            }
+            else if ((strncasecmp(ext, "pgm", 3) == 0) || (strncasecmp(ext, "ppm", 3) == 0) || (strncasecmp(ext, "psd", 3) == 0)
+                || (strncasecmp(ext, "tga", 3) == 0)) {
+                tex = Textures::LoadImageBuffer(data, size);
+            }
         }
 
         std::free(data);

libs/include/libtiff/LICENSE.md

@@ -0,0 +1,23 @@
+# LibTIFF license
+
+Copyright © 1988-1997 Sam Leffler\
+Copyright © 1991-1997 Silicon Graphics, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and 
+its documentation for any purpose is hereby granted without fee, provided
+that (i) the above copyright notices and this permission notice appear in
+all copies of the software and related documentation, and (ii) the names of
+Sam Leffler and Silicon Graphics may not be used in any advertising or
+publicity relating to the software without the specific, prior written
+permission of Sam Leffler and Silicon Graphics.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
+
+IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
+ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
+LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+OF THIS SOFTWARE.

libs/include/libtiff/tif_config.h

@@ -0,0 +1,157 @@
+/* clang-format off */
+/* clang-format disabled because CMake scripts are very sensitive to the
+ * formatting of this file. configure_file variables of type "" are
+ * modified by clang-format and won't be substituted.
+ */
+
+/* libtiff/tif_config.h.cmake.in.  Not generated, but originated from autoheader.  */
+/* This file must be kept up-to-date with needed substitutions from libtiff/tif_config.h.in. */
+
+#include "tiffconf.h"
+
+/* Support CCITT Group 3 & 4 algorithms */
+#define CCITT_SUPPORT 1
+
+/* Pick up YCbCr subsampling info from the JPEG data stream to support files
+   lacking the tag (default enabled). */
+#define CHECK_JPEG_YCBCR_SUBSAMPLING 1
+
+/* enable partial strip reading for large strips (experimental) */
+/* #undef CHUNKY_STRIP_READ_SUPPORT */
+
+/* Support C++ stream API (requires C++ compiler) */
+#define CXX_SUPPORT 1
+
+/* enable deferred strip/tile offset/size loading (experimental) */
+/* #undef DEFER_STRILE_LOAD */
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't. */
+#define HAVE_DECL_OPTARG 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+/* #undef HAVE_FSEEKO */
+
+/* Define to 1 if you have the `getopt' function. */
+#define HAVE_GETOPT 1
+
+/* Define to 1 if you have the <GLUT/glut.h> header file. */
+/* #undef HAVE_GLUT_GLUT_H */
+
+/* Define to 1 if you have the <GL/glut.h> header file. */
+#define HAVE_GL_GLUT_H 1
+
+/* Define to 1 if you have the <GL/glu.h> header file. */
+#define HAVE_GL_GLU_H 1
+
+/* Define to 1 if you have the <GL/gl.h> header file. */
+#define HAVE_GL_GL_H 1
+
+/* Define to 1 if you have the <io.h> header file. */
+/* #undef HAVE_IO_H */
+
+/* Define to 1 if you have the `jbg_newlen' function. */
+/* #undef HAVE_JBG_NEWLEN */
+
+/* Define to 1 if you have the `mmap' function. */
+/* #undef HAVE_MMAP */
+
+/* Define to 1 if you have the <OpenGL/glu.h> header file. */
+/* #undef HAVE_OPENGL_GLU_H */
+
+/* Define to 1 if you have the <OpenGL/gl.h> header file. */
+/* #undef HAVE_OPENGL_GL_H */
+
+/* Define to 1 if you have the `setmode' function. */
+/* #undef HAVE_SETMODE */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* 8/12 bit libjpeg dual mode enabled */
+/* #undef JPEG_DUAL_MODE_8_12 */
+
+/* Support LERC compression */
+/* #undef LERC_SUPPORT */
+
+/* 12bit libjpeg primary include file with path */
+#define LIBJPEG_12_PATH ""
+
+/* Support LZMA2 compression */
+#define LZMA_SUPPORT 1
+
+/* Name of package */
+#define PACKAGE "LibTIFF Software"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "tiff@lists.osgeo.org"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "LibTIFF Software"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "tiff"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Size of size_t */
+#define SIZEOF_SIZE_T 4
+
+/* Default size of the strip in bytes (when strip chopping enabled) */
+#define STRIP_SIZE_DEFAULT 8192
+
+/** Maximum number of TIFF IFDs that libtiff can iterate through in a file. */
+#define TIFF_MAX_DIR_COUNT 1048576
+
+/* define to use win32 IO system */
+/* #undef USE_WIN32_FILEIO */
+
+/* Support WEBP compression */
+/* #undef WEBP_SUPPORT */
+
+/* Support ZSTD compression */
+/* #undef ZSTD_SUPPORT */
+
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
+#if !defined(__MINGW32__)
+#  define TIFF_SIZE_FORMAT "zu"
+#endif
+#if SIZEOF_SIZE_T == 8
+#  define TIFF_SSIZE_FORMAT PRId64
+#  if defined(__MINGW32__)
+#    define TIFF_SIZE_FORMAT PRIu64
+#  endif
+#elif SIZEOF_SIZE_T == 4
+#  define TIFF_SSIZE_FORMAT PRId32
+#  if defined(__MINGW32__)
+#    define TIFF_SIZE_FORMAT PRIu32
+#  endif
+#else
+#  error "Unsupported size_t size; please submit a bug report"
+#endif
+
+/* clang-format on */