Commit: 36a3d53e301a87f7e2925351b0b74e8ead05fac8 - MIDITrailMod (git)

MIDITrail をピカピカにする。鍵盤方向自動切替・多ポート・歌詞対応等

Commit MetaInfo

• Revision: 36a3d53e301a87f7e2925351b0b74e8ead05fac8 (tree)
• Time: 2023-08-06 14:38:45
• Author: yoshy <yoshy@user...>
• Commiter: yoshy

Log Message

[CLEAN] 不要なnullチェック、空チェックを削除

Change Summary

• modified: MIDITrail/MTFont2Bmp.cpp
• modified: MIDITrail/MTNoteBox.cpp
• modified: MIDITrail/MTNoteBoxMod.cpp
• modified: MIDITrail/MTNoteRipple.cpp
• modified: MIDITrail/MTPianoKeyboardCtrl.cpp

Incremental Difference

--- a/MIDITrail/MTFont2Bmp.cpp
+++ b/MIDITrail/MTFont2Bmp.cpp
@@ -49,39 +49,13 @@ void MTFont2Bmp::Clear()
 		m_hFont = NULL;
 	}
 
-// >>> add 20120728 yossiepon begin
-	if(!m_GlyphBmpList.empty()) {
-// <<< add 20120728 yossiepon end
-
-		for (itr = m_GlyphBmpList.begin(); itr != m_GlyphBmpList.end(); itr++) {
-
-// >>> add 20120728 yossiepon begin
-			if(itr->pBmp != NULL) {
-// <<< add 20120728 yossiepon end
-
-				delete [] (itr->pBmp);
-
-// >>> add 20120728 yossiepon begin
-			}
-// <<< add 20120728 yossiepon end
-
-		}
-		m_GlyphBmpList.clear();
-
-// >>> add 20120728 yossiepon begin
+	for (itr = m_GlyphBmpList.begin(); itr != m_GlyphBmpList.end(); itr++) {
+		delete [] (itr->pBmp);
 	}
-// <<< add 20120728 yossiepon end
+	m_GlyphBmpList.clear();
 
-// >>> add 20120728 yossiepon begin
-	if(m_pBmpBuf != NULL) {
-// <<< add 20120728 yossiepon end
-
-		delete [] m_pBmpBuf;
-		m_pBmpBuf = NULL;
-
-// >>> add 20120728 yossiepon begin
-	}
-// <<< add 20120728 yossiepon end
+	delete [] m_pBmpBuf;
+	m_pBmpBuf = NULL;
 }
 
 //******************************************************************************
@@ -407,19 +381,9 @@ int MTFont2Bmp::_CreateBmpBuf()
 
 	//幅
 	m_BmpWidth = 0;
-
-// >>> add 20120728 yossiepon begin
-	if(!m_GlyphBmpList.empty()) {
-// <<< add 20120728 yossiepon end
-
-		for (itr = m_GlyphBmpList.begin(); itr != m_GlyphBmpList.end(); itr++) {
-			m_BmpWidth += (itr->glyphMetric.gmCellIncX);
-		}
-
-// >>> add 20120728 yossiepon begin
+	for (itr = m_GlyphBmpList.begin(); itr != m_GlyphBmpList.end(); itr++) {
+		m_BmpWidth += (itr->glyphMetric.gmCellIncX);
 	}
-// <<< add 20120728 yossiepon end
-
 	//幅を4の倍数にする
 	m_BmpWidth = m_BmpWidth + ((4 - (m_BmpWidth % 4)) % 4);
 
@@ -456,58 +420,50 @@ int MTFont2Bmp::_WriteGlyphToBmpBuf()
 	BYTE* pSrc = NULL;
 	BYTE* pDest = NULL;
 
-// >>> add 20120728 yossiepon begin
-	if(!m_GlyphBmpList.empty()) {
-// <<< add 20120728 yossiepon end
-
-		for (itr = m_GlyphBmpList.begin(); itr != m_GlyphBmpList.end(); itr++) {
-
-			//空文字はスキップ
-			if (itr->pBmp == NULL) {
-				offsetX += (itr->glyphMetric.gmCellIncX);
-				continue;
-			}
-
-			//コピー元グリフBMPの座標は4の倍数制限があるBMPサイズを意識せず
-			//実データの範囲でスキャンする
-			for (y = 0; y < (itr->glyphMetric.gmBlackBoxY); y++) {
-				//Ticket #33695 対策
-				//コピー先の領域外になる場合はスキップする
-				if (y >= m_BmpHeight) continue;
-
-				for (x = 0; x < (itr->glyphMetric.gmBlackBoxX); x++) {
+	for (itr = m_GlyphBmpList.begin(); itr != m_GlyphBmpList.end(); itr++) {
 
-					//コピー先の領域外になる場合はスキップする
-					destX = offsetX + (itr->glyphMetric.gmptGlyphOrigin.x) + x;
-					if (destX >= (m_BmpWidth-1)) continue;
-
-					//コピー元ピクセルポインタ：BMPサイズの4の倍数制限を意識して算出する
-					pSrc = itr->pBmp + (itr->bmpWidth * y) + x;
+		//空文字はスキップ
+		if (itr->pBmp == NULL) {
+			offsetX += (itr->glyphMetric.gmCellIncX);
+			continue;
+		}
 
-					//コピー先ピクセルポインタ
-					pDest = m_pBmpBuf
-								+ (m_TextMetric.tmAscent - (itr->glyphMetric.gmptGlyphOrigin.y) + y) * m_BmpWidth
-								+ (offsetX + (itr->glyphMetric.gmptGlyphOrigin.x) + x);
+		//コピー元グリフBMPの座標は4の倍数制限があるBMPサイズを意識せず
+		//実データの範囲でスキャンする
+		for (y = 0; y < (itr->glyphMetric.gmBlackBoxY); y++) {
+			//Ticket #33695 対策
+			//コピー先の領域外になる場合はスキップする
+			if (y >= m_BmpHeight) continue;
 
-					//確保したバッファを越えて書き込もうとしていないかチェックする
-					if (pDest > (m_pBmpBuf + (m_BmpHeight * m_BmpWidth) - 1)) {
-						//result = YN_SET_ERR("Program error.", itr->glyphMetric.gmBlackBoxY, itr->glyphMetric.gmBlackBoxX);
-						//goto EXIT;
-						//Ticket #33695 対策
-						//エラーとせずスキップする
-						continue;
-					}
+			for (x = 0; x < (itr->glyphMetric.gmBlackBoxX); x++) {
 
-					//ピクセルコピー
-					*pDest = *pSrc;
+				//コピー先の領域外になる場合はスキップする
+				destX = offsetX + (itr->glyphMetric.gmptGlyphOrigin.x) + x;
+				if (destX >= (m_BmpWidth-1)) continue;
+
+				//コピー元ピクセルポインタ：BMPサイズの4の倍数制限を意識して算出する
+				pSrc = itr->pBmp + (itr->bmpWidth * y) + x;
+
+				//コピー先ピクセルポインタ
+				pDest = m_pBmpBuf
+							+ (m_TextMetric.tmAscent - (itr->glyphMetric.gmptGlyphOrigin.y) + y) * m_BmpWidth
+							+ (offsetX + (itr->glyphMetric.gmptGlyphOrigin.x) + x);
+
+				//確保したバッファを越えて書き込もうとしていないかチェックする
+				if (pDest > (m_pBmpBuf + (m_BmpHeight * m_BmpWidth) - 1)) {
+					//result = YN_SET_ERR("Program error.", itr->glyphMetric.gmBlackBoxY, itr->glyphMetric.gmBlackBoxX);
+					//goto EXIT;
+					//Ticket #33695 対策
+					//エラーとせずスキップする
+					continue;
 				}
+
+				//ピクセルコピー
+				*pDest = *pSrc;
 			}
-			offsetX += (itr->glyphMetric.gmCellIncX);
 		}
-
-// >>> add 20120728 yossiepon begin
+		offsetX += (itr->glyphMetric.gmCellIncX);
 	}
-// <<< add 20120728 yossiepon end
 
 //EXIT:;
 	return result;

--- a/MIDITrail/MTNoteBox.cpp
+++ b/MIDITrail/MTNoteBox.cpp
@@ -532,12 +532,8 @@ void MTNoteBox::Release()
 	m_PrimitiveActiveNotes.Release();
 	m_NoteList.Clear();
 
-// >>> modify 20120728 yossiepon begin
-	if(m_pNoteStatus != NULL) {
-		delete [] m_pNoteStatus;
-		m_pNoteStatus = NULL;
-	}
-// <<< modify 20120728 yossiepon end
+	delete [] m_pNoteStatus;
+	m_pNoteStatus = NULL;
 }
 
 //******************************************************************************

--- a/MIDITrail/MTNoteBoxMod.cpp
+++ b/MIDITrail/MTNoteBoxMod.cpp
@@ -393,10 +393,8 @@ EXIT:;
 //******************************************************************************
 void MTNoteBoxMod::Release()
 {
-	if(m_pNoteStatusMod != NULL) {
-		delete [] m_pNoteStatusMod;
-		m_pNoteStatusMod = NULL;
-	}
+	delete [] m_pNoteStatusMod;
+	m_pNoteStatusMod = NULL;
 }
 
 //******************************************************************************

--- a/MIDITrail/MTNoteRipple.cpp
+++ b/MIDITrail/MTNoteRipple.cpp
@@ -282,7 +282,6 @@ EXIT:;
 //******************************************************************************
 void MTNoteRipple::Release()
 {
-
 	delete m_pNoteDesign;
 	m_pNoteDesign = NULL;
 
@@ -293,12 +292,8 @@ void MTNoteRipple::Release()
 		m_pTexture = NULL;
 	}
 
-// >>> modify 20120728 yossiepon begin
-	if(m_pNoteStatus != NULL) {
-		delete [] m_pNoteStatus;
-		m_pNoteStatus = NULL;
-	}
-// <<< modify 20120728 yossiepon end
+	delete [] m_pNoteStatus;
+	m_pNoteStatus = NULL;
 }
 
 //******************************************************************************

--- a/MIDITrail/MTPianoKeyboardCtrl.cpp
+++ b/MIDITrail/MTPianoKeyboardCtrl.cpp
@@ -528,11 +528,9 @@ void MTPianoKeyboardCtrl::Release()
 	}
 
 // >>> modify 20120728 yossiepon begin
-	if(m_pNoteStatus != NULL) {
-		//20120728 yossiepon: delete を delete[] に修正
-		delete[] m_pNoteStatus;
-		m_pNoteStatus = NULL;
-	}
+	//20120728 yossiepon: delete を delete[] に修正
+	delete[] m_pNoteStatus;
+	m_pNoteStatus = NULL;
 // <<< modify 20120728 yossiepon end
 }