diff --git a/CMakeLists.txt b/CMakeLists.txt index e3545fe..1000b22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ find_library(LIBTIFF_LIBRARY NAMES tiff) find_path(LIBTIFF_INCLUDE_DIR NAMES tiff.h) if(LIBTIFF_LIBRARY) - list(APPEND GSKIT_EXTERNAL_LIBS lzma tiff_ps2_addons ${LIBTIFF_LIBRARY}) + list(APPEND GSKIT_EXTERNAL_LIBS lzma ${LIBTIFF_LIBRARY}) include_directories(${LIBTIFF_INCLUDE_DIR}) add_definitions(-DHAVE_LIBTIFF) endif() diff --git a/ee/toolkit/src/gsToolkit.c b/ee/toolkit/src/gsToolkit.c index 4be872c..eadacda 100644 --- a/ee/toolkit/src/gsToolkit.c +++ b/ee/toolkit/src/gsToolkit.c @@ -24,7 +24,6 @@ #ifdef HAVE_LIBTIFF #include -#include #endif #ifdef HAVE_LIBPNG @@ -762,7 +761,7 @@ int gsKit_texture_tiff(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, char *Path) Texture->Mem = memalign(128,TextureSize); - if (!TIFFReadPS2Image(tif, Texture->Width, Texture->Height, (uint32_t *)Texture->Mem, 0)) + if (!TIFFReadRGBAImage(tif, Texture->Width, Texture->Height, (uint32_t *)Texture->Mem, 0)) { printf("Error Reading TIFF Data\n"); TIFFClose(tif); diff --git a/examples/alpha/alpha.c b/examples/alpha/alpha.c index a71d585..b87f72f 100644 --- a/examples/alpha/alpha.c +++ b/examples/alpha/alpha.c @@ -87,12 +87,13 @@ int main(int argc, char *argv[]) gsKit_set_test(gsGlobal, GS_ATEST_OFF); #ifdef HAVE_LIBTIFF gsKit_TexManager_bind(gsGlobal, &Sprite); - gsKit_prim_sprite_texture(gsGlobal, &Sprite, 310.0f, // X1 - 50.0f, // Y2 + gsKit_prim_sprite_texture(gsGlobal, &Sprite, + 100.0f, // X1 + +400.0f, // Y2 0.0f, // U1 0.0f, // V1 Sprite.Width + 310.0f, // X2 - Sprite.Height + 50.0f, // Y2 + Sprite.Height - 250.0f, // Y2 Sprite.Width, // U2 Sprite.Height, // V2 3,