aboutsummaryrefslogtreecommitdiff
path: root/guilib
diff options
context:
space:
mode:
authorvdrfan <vdrfan@svn>2010-05-08 07:56:16 +0000
committervdrfan <vdrfan@svn>2010-05-08 07:56:16 +0000
commit860aca4a203083a690e5355f45ead6966acb8b42 (patch)
tree8b7981e8a2ade7a01199b654ccd625ed43600177 /guilib
parent5126bea0d5cbf8c8114656de4cd07fdf46ea7fb0 (diff)
fixed: compile warnings
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29921 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
-rw-r--r--guilib/DDSImage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/guilib/DDSImage.cpp b/guilib/DDSImage.cpp
index 187f9c8a25..84d35c2b00 100644
--- a/guilib/DDSImage.cpp
+++ b/guilib/DDSImage.cpp
@@ -159,11 +159,11 @@ bool CDDSImage::Compress(unsigned int width, unsigned int height, unsigned int p
Allocate(width, height, XB_FMT_DXT1);
squish::CompressImage(brga, width, height, pitch, m_data, squish::kDxt1 | squish::kSourceBGRA);
- char *fourCC = NULL;
+ const char *fourCC = NULL;
double colorMSE, alphaMSE;
squish::ComputeMSE(brga, width, height, pitch, m_data, squish::kDxt1 | squish::kSourceBGRA, colorMSE, alphaMSE);
- if (!maxMSE || colorMSE < maxMSE && alphaMSE < maxMSE)
+ if ((!maxMSE || colorMSE) < maxMSE && alphaMSE < maxMSE)
fourCC = "DXT1";
else
{