From 51a24b88a34fd94737b19aeeb3b057edef472055 Mon Sep 17 00:00:00 2001 From: castano Date: Fri, 18 May 2007 11:06:09 +0000 Subject: [PATCH] fix include header. return true in isSupported() --- src/nvimage/BlockDXT.h | 2 +- src/nvimage/DirectDrawSurface.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/nvimage/BlockDXT.h b/src/nvimage/BlockDXT.h index 22c8b8d..aa9c4f4 100644 --- a/src/nvimage/BlockDXT.h +++ b/src/nvimage/BlockDXT.h @@ -26,7 +26,7 @@ #include -#include +#include namespace nv { diff --git a/src/nvimage/DirectDrawSurface.cpp b/src/nvimage/DirectDrawSurface.cpp index 9bd01eb..fe24978 100644 --- a/src/nvimage/DirectDrawSurface.cpp +++ b/src/nvimage/DirectDrawSurface.cpp @@ -368,7 +368,7 @@ bool DirectDrawSurface::isSupported() const if (header.pf.flags & DDPF_FOURCC) { - if (header.pf.fourcc != FOURCC_DXT1 && + if (header.pf.fourcc != FOURCC_DXT1 && header.pf.fourcc != FOURCC_DXT2 && header.pf.fourcc != FOURCC_DXT3 && header.pf.fourcc != FOURCC_DXT4 && @@ -385,9 +385,11 @@ bool DirectDrawSurface::isSupported() const { if (header.pf.bitcount == 24) { + return false; } - else if (header.pf.bitcount == 24) + else if (header.pf.bitcount == 32) { + return false; } else { @@ -412,7 +414,7 @@ bool DirectDrawSurface::isSupported() const return false; } - return false; + return true; }