From ed2bcc38386216a0eb86f528983d1938d74db028 Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Fri, 28 Mar 2014 11:40:52 -0400
Subject: [PATCH] Fix some small bugs to hook into NVTT

---
 BPTCEncoder/config/BPTCConfig.h.in |  2 +-
 BPTCEncoder/src/CompressNVTT.cpp   | 12 ++++++------
 CMakeModules/FindBC7Export.cmake   |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/BPTCEncoder/config/BPTCConfig.h.in b/BPTCEncoder/config/BPTCConfig.h.in
index a3d2570..9f37d88 100644
--- a/BPTCEncoder/config/BPTCConfig.h.in
+++ b/BPTCEncoder/config/BPTCConfig.h.in
@@ -62,4 +62,4 @@
 #cmakedefine HAS_GCC_ATOMICS
 #cmakedefine HAS_MSVC_ATOMICS
 
-#cmakedefine FOUND_NVTT_BC7_EXPORT
+#cmakedefine FOUND_NVTT_BPTC_EXPORT
diff --git a/BPTCEncoder/src/CompressNVTT.cpp b/BPTCEncoder/src/CompressNVTT.cpp
index 096ee3d..e07bda1 100644
--- a/BPTCEncoder/src/CompressNVTT.cpp
+++ b/BPTCEncoder/src/CompressNVTT.cpp
@@ -50,8 +50,8 @@
  * <http://gamma.cs.unc.edu/FasTC/>
  */
 
-#include "BC7Compressor.h"
-#include "BC7CompressionMode.h"
+#include "BPTCCompressor.h"
+#include "CompressionMode.h"
 #undef DBL_MAX
 #include "BitStream.h"
 #include "TexCompTypes.h"
@@ -62,7 +62,7 @@
 
 #include "avpcl.h"
 
-namespace BC7C {
+namespace BPTCC {
 
   void GetBlock(uint32 x, uint32 y, uint32 width, const uint32 *pixels, Tile &t) {
     for(uint32 j = 0; j < 4; j++)
@@ -146,11 +146,11 @@ namespace BC7C {
     double mse = kModeFuncs[mode](t, out);
     PrintStat(log, ss.str().c_str(), mse);
 
-    BitStreamReadOnly strm(reinterpret_cast<uint8 *>(out));
+    FasTC::BitStreamReadOnly strm(reinterpret_cast<uint8 *>(out));
     while(!strm.ReadBit());
 
-    const BC7CompressionMode::Attributes *attrs =
-      BC7CompressionMode::GetAttributesForMode(mode);
+    const CompressionMode::Attributes *attrs =
+      CompressionMode::GetAttributesForMode(mode);
     const uint32 nSubsets = attrs->numSubsets;
 
     ss.str("");
diff --git a/CMakeModules/FindBC7Export.cmake b/CMakeModules/FindBC7Export.cmake
index 94474f0..675c2be 100644
--- a/CMakeModules/FindBC7Export.cmake
+++ b/CMakeModules/FindBC7Export.cmake
@@ -66,6 +66,7 @@ IF(NOT AVPCLLIB_ROOT STREQUAL "")
   ENDIF()
   ADD_SUBDIRECTORY(${AVPCLLIB_ROOT}/src ${CMAKE_CURRENT_BINARY_DIR}/bc7_export)
   set(AVPCLLIB_INCLUDE_DIR ${AVPCLLIB_ROOT}/src )
+  SET(FOUND_NVTT_BPTC_EXPORT TRUE)
 ENDIF()
 
 mark_as_advanced( FORCE AVPCLLIB_ROOT AVPCLLIB_INCLUDE_DIR )