From 613fb9c6ef6888568a47e5e08f462839bcfe7758 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Fri, 3 Jan 2014 17:55:40 +0000
Subject: (svn r26221) -Codechange: normalize constant names in anim-sse4 with
 the others (MJP)

---
 src/blitter/32bpp_anim_sse4.cpp | 4 ++--
 src/blitter/32bpp_anim_sse4.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp
index c6008b007..27defd6de 100644
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/src/blitter/32bpp_anim_sse4.cpp
@@ -372,7 +372,7 @@ void Blitter_32bppSSE4_Anim::Draw(Blitter::BlitterParams *bp, BlitterMode mode,
 	switch (mode) {
 		case BM_NORMAL: {
 			const BlockType bt_last = (BlockType) (bp->width & 1);
-			if (bp->skip_left != 0 || bp->width <= MARGIN_THRESHOLD) {
+			if (bp->skip_left != 0 || bp->width <= MARGIN_NORMAL_THRESHOLD) {
 				switch (bt_last) {
 					case BT_EVEN: Draw<BM_NORMAL, RM_WITH_SKIP, BT_EVEN>(bp, zoom); return;
 					case BT_ODD:  Draw<BM_NORMAL, RM_WITH_SKIP, BT_ODD>(bp, zoom); return;
@@ -388,7 +388,7 @@ void Blitter_32bppSSE4_Anim::Draw(Blitter::BlitterParams *bp, BlitterMode mode,
 			break;
 		}
 		case BM_COLOUR_REMAP:
-			if (bp->skip_left != 0 || bp->width <= MARGIN_THRESHOLD) {
+			if (bp->skip_left != 0 || bp->width <= MARGIN_REMAP_THRESHOLD) {
 				Draw<BM_COLOUR_REMAP, RM_WITH_SKIP, BT_NONE>(bp, zoom); return;
 			} else {
 				Draw<BM_COLOUR_REMAP, RM_WITH_MARGIN, BT_NONE>(bp, zoom); return;
diff --git a/src/blitter/32bpp_anim_sse4.hpp b/src/blitter/32bpp_anim_sse4.hpp
index 90aec22d8..0f1131c88 100644
--- a/src/blitter/32bpp_anim_sse4.hpp
+++ b/src/blitter/32bpp_anim_sse4.hpp
@@ -17,8 +17,8 @@
 #include "32bpp_anim.hpp"
 #include "32bpp_sse4.hpp"
 
-#undef MARGIN_THRESHOLD
-#define MARGIN_THRESHOLD 4
+#undef MARGIN_NORMAL_THRESHOLD
+#define MARGIN_NORMAL_THRESHOLD 4
 
 /** The SSE4 32 bpp blitter with palette animation. */
 class Blitter_32bppSSE4_Anim FINAL : public Blitter_32bppAnim, public Blitter_32bppSSE_Base {
-- 
cgit v1.2.3-70-g09d2