summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleo2009-02-24 06:46:44 +0000
committerleo2009-02-24 06:46:44 +0000
commitc189cf6e36a9978141651741568976e41a9bb123 (patch)
tree79271de3b6737edc4f4a64276f2a29b0298a901c
parent324e119ed026f5983b4b85a4b6209e27a3d0c0d0 (diff)
Renamed conflicting variable.
git-svn-id: http://svn.leocad.org/tags/leocad-0.75@745 c7d43263-9d01-0410-8a33-9dba5d9f93d6
-rw-r--r--common/quant.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/common/quant.cpp b/common/quant.cpp
index d2072a3..2191cb3 100644
--- a/common/quant.cpp
+++ b/common/quant.cpp
@@ -217,16 +217,16 @@ static int build_table(unsigned char *image, unsigned long pixels)
return 1;
}
-static void fixheap(unsigned long id)
+static void fixheap(unsigned long heapid)
{
- unsigned char thres_level = heap[id].level;
- unsigned long thres_index = heap[id].index, index = 0;
+ unsigned char thres_level = heap[heapid].level;
+ unsigned long thres_index = heap[heapid].index, index = 0;
unsigned long half_totc = tot_colors >> 1;
unsigned long thres_val = rgb_table[thres_level][thres_index].pixels_in_cube;
- while (id <= half_totc)
+ while (heapid <= half_totc)
{
- index = id << 1;
+ index = heapid << 1;
if (index < (unsigned long)tot_colors)
if (rgb_table[heap[index].level][heap[index].index].pixels_in_cube
@@ -236,12 +236,12 @@ static void fixheap(unsigned long id)
if (thres_val <= rgb_table[heap[index].level][heap[index].index].pixels_in_cube)
break;
else {
- heap[id] = heap[index];
- id = index;
+ heap[heapid] = heap[index];
+ heapid = index;
}
}
- heap[id].level = thres_level;
- heap[id].index = (unsigned short)thres_index;
+ heap[heapid].level = thres_level;
+ heap[heapid].index = (unsigned short)thres_index;
}
static void reduce_table(int num_colors)