[x265-commits] [x265] analysis: typo

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/d00a5b93c07e
branches:  
changeset: 8985:d00a5b93c07e
user:      Steve Borho <steve at borho.org>
date:      Fri Dec 12 21:51:40 2014 -0600
description:
analysis: typo
Subject: [x265] cmake: eoln and white-space fixes, slight refactor

details:   http://hg.videolan.org/x265/rev/ee36b6311aaf
branches:  
changeset: 8986:ee36b6311aaf
user:      Steve Borho <steve at borho.org>
date:      Sat Dec 13 00:24:11 2014 -0600
description:
cmake: eoln and white-space fixes, slight refactor

diffstat:

 source/CMakeLists.txt                       |  17 +++++++++--------
 source/cmake/CMakeASM_YASMInformation.cmake |   6 +++---
 source/encoder/analysis.h                   |   2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diffs (62 lines):

diff -r afdcb68dace4 -r ee36b6311aaf source/CMakeLists.txt
--- a/source/CMakeLists.txt	Fri Dec 12 15:49:23 2014 -0600
+++ b/source/CMakeLists.txt	Sat Dec 13 00:24:11 2014 -0600
@@ -63,6 +63,12 @@ if(UNIX)
     endif()
 endif(UNIX)
 
+if(X64 AND NOT WIN32)
+    option(ENABLE_PIC "Enable Position Independent Code" ON)
+else()
+    option(ENABLE_PIC "Enable Position Independent Code" OFF)
+endif(X64 AND NOT WIN32)
+
 # Compiler detection
 if(CMAKE_GENERATOR STREQUAL "Xcode")
   set(XCODE 1)
@@ -121,14 +127,9 @@ endif()
 if(GCC)
     add_definitions(-Wall -Wextra -Wshadow)
     add_definitions(-D__STDC_LIMIT_MACROS=1)
-    if(X64 AND NOT WIN32)
-        option(ENABLE_PIC "Enable Position Independent Code" ON)
-    else()
-        option(ENABLE_PIC "Enable Position Independent Code" OFF)
-    endif(X64 AND NOT WIN32)
-    if (ENABLE_PIC)
-         add_definitions(-fPIC)
-    endif(ENABLE_PIC)
+    if(ENABLE_PIC)
+         add_definitions(-fPIC)
+    endif(ENABLE_PIC)
     if(X86 AND NOT X64)
         add_definitions(-march=i686)
     endif()
diff -r afdcb68dace4 -r ee36b6311aaf source/cmake/CMakeASM_YASMInformation.cmake
--- a/source/cmake/CMakeASM_YASMInformation.cmake	Fri Dec 12 15:49:23 2014 -0600
+++ b/source/cmake/CMakeASM_YASMInformation.cmake	Sat Dec 13 00:24:11 2014 -0600
@@ -2,9 +2,9 @@ set(ASM_DIALECT "_YASM")
 set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm)
 
 if(X64)
-    list(APPEND ASM_FLAGS -DARCH_X86_64=1)
-    if (ENABLE_PIC)
-        list(APPEND ASM_FLAGS -DPIC)
+    list(APPEND ASM_FLAGS -DARCH_X86_64=1)
+    if(ENABLE_PIC)
+        list(APPEND ASM_FLAGS -DPIC)
     endif()
     if(APPLE)
         set(ARGS -f macho64 -m amd64 -DPREFIX)
diff -r afdcb68dace4 -r ee36b6311aaf source/encoder/analysis.h
--- a/source/encoder/analysis.h	Fri Dec 12 15:49:23 2014 -0600
+++ b/source/encoder/analysis.h	Sat Dec 13 00:24:11 2014 -0600
@@ -72,7 +72,7 @@ public:
 
     ModeDepth m_modeDepth[NUM_CU_DEPTH];
     bool      m_bTryLossless;
-    bool      m_bChromaSa8d;;
+    bool      m_bChromaSa8d;
 
     /* Analysis data for load/save modes, keeps getting incremented as CTU analysis proceeds and data is consumed or read */
     analysis_intra_data* m_reuseIntraDataCTU;