Skip to content

Commit 9ef2892

Browse files
authored
Merge pull request #83 from Wolf3s/remove-tif-config.h
Remove tif-config.h and his helper function.
2 parents bd3a1ed + a0e397c commit 9ef2892

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ find_library(LIBTIFF_LIBRARY NAMES tiff)
4141
find_path(LIBTIFF_INCLUDE_DIR NAMES tiff.h)
4242

4343
if(LIBTIFF_LIBRARY)
44-
list(APPEND GSKIT_EXTERNAL_LIBS ${LIBTIFF_LIBRARY})
44+
list(APPEND GSKIT_EXTERNAL_LIBS lzma ${LIBTIFF_LIBRARY})
4545
include_directories(${LIBTIFF_INCLUDE_DIR})
4646
add_definitions(-DHAVE_LIBTIFF)
4747
endif()

ee/toolkit/src/gsToolkit.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#endif
2424

2525
#ifdef HAVE_LIBTIFF
26-
#include <tif_config.h>
2726
#include <tiffio.h>
2827
#endif
2928

@@ -762,7 +761,7 @@ int gsKit_texture_tiff(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, char *Path)
762761

763762
Texture->Mem = memalign(128,TextureSize);
764763

765-
if (!TIFFReadPS2Image(tif, Texture->Width, Texture->Height, (u32 *)Texture->Mem, 0))
764+
if (!TIFFReadRGBAImage(tif, Texture->Width, Texture->Height, (uint32_t *)Texture->Mem, 0))
766765
{
767766
printf("Error Reading TIFF Data\n");
768767
TIFFClose(tif);

examples/alpha/alpha.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,13 @@ int main(int argc, char *argv[])
8787
gsKit_set_test(gsGlobal, GS_ATEST_OFF);
8888
#ifdef HAVE_LIBTIFF
8989
gsKit_TexManager_bind(gsGlobal, &Sprite);
90-
gsKit_prim_sprite_texture(gsGlobal, &Sprite, 310.0f, // X1
91-
50.0f, // Y2
90+
gsKit_prim_sprite_texture(gsGlobal, &Sprite,
91+
100.0f, // X1
92+
+400.0f, // Y2
9293
0.0f, // U1
9394
0.0f, // V1
9495
Sprite.Width + 310.0f, // X2
95-
Sprite.Height + 50.0f, // Y2
96+
Sprite.Height - 250.0f, // Y2
9697
Sprite.Width, // U2
9798
Sprite.Height, // V2
9899
3,

0 commit comments

Comments
 (0)