From 7d39e6b6fe10df50cace57d78647607c8b06a63d Mon Sep 17 00:00:00 2001
From: suehring <suehring@ce97f6c2-8f86-0410-b44d-af84b13ec34f>
Date: Tue, 8 Jul 2014 01:47:49 +0000
Subject: [PATCH 1/2] create HM-15.0 based development branch


From 551413d7e7887ac593d81f2fe295196bcdf45a33 Mon Sep 17 00:00:00 2001
From: Phil Sun <sammymax@users.noreply.github.com>
Date: Mon, 16 Oct 2017 05:18:47 +0000
Subject: [PATCH 2/2] Change .gitignore to use tapir; fix compiler errors

---
 .gitignore                               |  6 ++++++
 build/linux/common/makefile.base         | 21 +++++++++++----------
 source/Lib/TLibCommon/TComLoopFilter.cpp |  7 ++-----
 source/Lib/TLibCommon/TComPic.h          |  3 ---
 4 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..ff6995b73
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# initial / is needed or else x/bin/... will also be ignored
+/bin
+/lib
+/build/linux/app/*/objects
+/build/linux/lib/*/objects
+/build/linux/utils/*/objects
diff --git a/build/linux/common/makefile.base b/build/linux/common/makefile.base
index 16a8d2ae2..34bd44c4d 100644
--- a/build/linux/common/makefile.base
+++ b/build/linux/common/makefile.base
@@ -11,9 +11,10 @@ endif
 #########################################################
 # executables used
 #########################################################
+TAPIR_DIR = ~/tapir/src/build/bin
 
-CPP     = g++
-CC      = gcc
+CPP     = $(TAPIR_DIR)/clang++
+CC      = $(TAPIR_DIR)/clang
 AR    	= ar
 LD    	= $(CPP)
 ASM		= nasm
@@ -29,7 +30,7 @@ STAT_RELEASE_OUT  	= $(LIB_DIR)/lib$(PRJ_NAME)Static.a
 DYN_DEBUG_OUT     	= $(LIB_DIR)/lib$(PRJ_NAME)d.so
 DYN_RELEASE_OUT   	= $(LIB_DIR)/lib$(PRJ_NAME).so
 #
-else 
+else
 ifeq ($(CONFIG), CONSOLE)
 # the executables that can be created
 STAT_DEBUG_OUT    = $(BIN_DIR)/$(PRJ_NAME)Staticd
@@ -49,7 +50,7 @@ endif
 #CPPFLAGS          = -Wall -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
 CPPFLAGS          = -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
 
-########## 
+##########
 # enforce 32-bit build : 1=yes, 0=no
 ##########
 M32?= 0
@@ -88,7 +89,7 @@ RELEASE_ASMFLAGS  =
 # linker flags for all
 ALL_LDFLAGS       = -Wall
 
-########## 
+##########
 # enforce 32-bit build : 1=yes, 0=no
 ##########
 ifeq ($(M32),1)
@@ -128,7 +129,7 @@ endif
 # objects that have to be created
 #########################################################
 
-# the object types that have to be created      
+# the object types that have to be created
 RELEASE_OBJS  = $(OBJS:.o=.r.o)
 DEBUG_OBJS    = $(OBJS:.o=.d.o)
 
@@ -351,7 +352,7 @@ release:          	check_errors \
 #stat_debug:       	check_errors \
 #					$(CHECK_DIRS) \
 #					$(STAT_DEBUG_OUT)
-#          
+#
 #dyn_debug:        	check_errors \
 #					$(CHECK_DIRS) \
 #					$(DYN_DEBUG_OUT)
@@ -359,7 +360,7 @@ release:          	check_errors \
 #stat_release:     	check_errors \
 #					$(CHECK_DIRS) \
 #					$(STAT_RELEASE_OUT)
-#        
+#
 #dyn_release:      	check_errors \
 #					$(CHECK_DIRS) \
 #					$(DYN_RELEASE_OUT)
@@ -412,11 +413,11 @@ $(STAT_RELEASE_OUT): $(RELEASE_OBJS)
 #
 #
 # create dynamic debug out
-$(DYN_DEBUG_OUT): $(DYN_DEBUG_OUT).$(VER) 
+$(DYN_DEBUG_OUT): $(DYN_DEBUG_OUT).$(VER)
 	ln -fs lib$(PRJ_NAME)d.so.$(VER) $@
 #
 # create dynamic debug out
-$(DYN_DEBUG_OUT).$(VER): $(DEBUG_OBJS) 
+$(DYN_DEBUG_OUT).$(VER): $(DEBUG_OBJS)
 	$(LD) $(LDFLAGS) $(DEBUG_LDFLAGS) -o $@ $(DEBUG_OBJS) -L$(LIB_DIR) $(USER_LIB_DIRS) $(LIBS) $(DEBUG_LIBS) $(DYN_LIBS) $(DYN_DEBUG_LIBS)
 #
 #
diff --git a/source/Lib/TLibCommon/TComLoopFilter.cpp b/source/Lib/TLibCommon/TComLoopFilter.cpp
index 211190e11..e79e74cff 100644
--- a/source/Lib/TLibCommon/TComLoopFilter.cpp
+++ b/source/Lib/TLibCommon/TComLoopFilter.cpp
@@ -108,11 +108,8 @@ Void TComLoopFilter::destroy()
 {
   for( UInt uiDir = 0; uiDir < 2; uiDir++ )
   {
-    if (m_aapucBS)
-    {
-      delete [] m_aapucBS       [uiDir];
-      m_aapucBS [uiDir] = NULL;
-    }
+    delete [] m_aapucBS       [uiDir];
+    m_aapucBS [uiDir] = NULL;
     if (m_aapbEdgeFilter[uiDir])
     {
       delete [] m_aapbEdgeFilter[uiDir];
diff --git a/source/Lib/TLibCommon/TComPic.h b/source/Lib/TLibCommon/TComPic.h
index 5a4f75ae6..38ad12d9f 100644
--- a/source/Lib/TLibCommon/TComPic.h
+++ b/source/Lib/TLibCommon/TComPic.h
@@ -122,9 +122,6 @@ class TComPic
   UInt          getMinCUWidth()         { return m_apcPicSym->getMinCUWidth();         }
   UInt          getMinCUHeight()        { return m_apcPicSym->getMinCUHeight();        }
   
-  UInt          getParPelX(UChar uhPartIdx) { return getParPelX(uhPartIdx); }
-  UInt          getParPelY(UChar uhPartIdx) { return getParPelX(uhPartIdx); }
-  
   Int           getStride()           { return m_apcPicYuv[1]->getStride(); }
   Int           getCStride()          { return m_apcPicYuv[1]->getCStride(); }