libibl doesn't need to depend on libimage

google · Mar 13, 2019 · 13d3ade · 13d3ade
1 parent 54d292b
commit 13d3ade
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/libs/ibl/CMakeLists.txt b/libs/ibl/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(${PUBLIC_HDR_DIR})
 add_library(${TARGET} ${PUBLIC_HDRS} ${SRCS})
 target_include_directories(${TARGET} PUBLIC ${PUBLIC_HDR_DIR})
 
-target_link_libraries(${TARGET} math utils image)
+target_link_libraries(${TARGET} math utils)
 
 # ==================================================================================================
 # Compile options and optimizations

diff --git a/libs/ibl/include/ibl/Image.h b/libs/ibl/include/ibl/Image.h
@@ -17,8 +17,6 @@
 #ifndef IBL_IMAGE_H
 #define IBL_IMAGE_H
 
-#include <image/ColorTransform.h>
-
 #include <math/scalar.h>
 #include <math/vec3.h>
 #include <math/vec4.h>

diff --git a/libs/ibl/src/CubemapIBL.cpp b/libs/ibl/src/CubemapIBL.cpp
@@ -29,7 +29,6 @@
 #include <vector>
 
 using namespace filament::math;
-using namespace image;
 using namespace utils;
 
 namespace filament {

diff --git a/libs/ibl/src/CubemapUtils.cpp b/libs/ibl/src/CubemapUtils.cpp
@@ -27,7 +27,6 @@
 #include <math.h>
 
 using namespace filament::math;
-using namespace image;
 using namespace utils;
 
 namespace filament {

diff --git a/tools/cmgen/src/cmgen.cpp b/tools/cmgen/src/cmgen.cpp
@@ -28,6 +28,7 @@
 #include <imageio/ImageEncoder.h>
 
 #include <image/KtxBundle.h>
+#include <image/ColorTransform.h>
 
 #include <utils/Path.h>
 
@@ -69,7 +70,7 @@ static utils::Path g_extract_dir;
 
 static size_t g_output_size = 0;
 
-       bool g_quiet = false; // needed outside of this file
+static bool g_quiet = false;
 static bool g_debug = false;
 
 static size_t g_sh_compute = 0;