From 9af453bb925eeec88b6b644b401b0818587f03d3 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 13 Oct 2013 06:17:41 +0000
Subject: [PATCH] r4087, attempt #2: Fix "warning: iteration 1461 invokes
 undefined behavior [-Waggressive-loop-optimizations]" in initkpeg().

git-svn-id: https://svn.eduke32.com/eduke32@4101 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/kplib.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/build/src/kplib.c b/polymer/eduke32/build/src/kplib.c
index 900840bf0..3aae1649e 100644
--- a/polymer/eduke32/build/src/kplib.c
+++ b/polymer/eduke32/build/src/kplib.c
@@ -1204,11 +1204,11 @@ static inline int32_t mulshr32(int32_t a, int32_t b)
 
 static int32_t cosqr16[8] =    //cosqr16[i] = ((cos(PI*i/16)*sqrt(2))<<24);
 {23726566,23270667,21920489,19727919,16777216,13181774,9079764,4628823};
-static int64_t crmul[4096], cbmul[4096];
+static int32_t crmul[4096], cbmul[4096];
 
 static void initkpeg()
 {
-    int32_t i, x, y;
+    int32_t i, j, x, y;
 
     x = 0;  //Back & forth diagonal pattern (aligning bytes for best compression)
     for (i=0; i<16; i+=2)
@@ -1241,10 +1241,11 @@ static void initkpeg()
 
     for (i=0; i<2048; i++)
     {
-        crmul[(i<<1)+0] = (i-1024)*(int64_t)1470104; //1.402*1048576
-        crmul[(i<<1)+1] = (i-1024)*(int64_t)-748830; //-0.71414*1048576
-        cbmul[(i<<1)+0] = (i-1024)*(int64_t)-360857; //-0.34414*1048576
-        cbmul[(i<<1)+1] = (i-1024)*(int64_t)1858077; //1.772*1048576
+        j = i-1024;
+        crmul[(i<<1)+0] = j*1470104; //1.402*1048576
+        crmul[(i<<1)+1] = j*-748830; //-0.71414*1048576
+        cbmul[(i<<1)+0] = j*-360857; //-0.34414*1048576
+        cbmul[(i<<1)+1] = j*1858077; //1.772*1048576
     }
 
     Bmemset((void *)&dct[10][0],0,64*2*sizeof(dct[0][0]));