projects
/
platform
/
upstream
/
cmake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.8.12.2
[platform/upstream/cmake.git]
/
Utilities
/
cmlibarchive
/
libarchive
/
archive_ppmd7.c
diff --git
a/Utilities/cmlibarchive/libarchive/archive_ppmd7.c
b/Utilities/cmlibarchive/libarchive/archive_ppmd7.c
index
b2e8c3a
..
fe0b031
100644
(file)
--- a/
Utilities/cmlibarchive/libarchive/archive_ppmd7.c
+++ b/
Utilities/cmlibarchive/libarchive/archive_ppmd7.c
@@
-415,7
+415,7
@@
static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip)
upState.Freq = (Byte)(1 + ((2 * cf <= s0) ? (5 * cf > s0) : ((2 * cf + 3 * s0 - 1) / (2 * s0))));
}
upState.Freq = (Byte)(1 + ((2 * cf <= s0) ? (5 * cf > s0) : ((2 * cf + 3 * s0 - 1) / (2 * s0))));
}
- do
+ while (numPs != 0)
{
/* Create Child */
CTX_PTR c1; /* = AllocContext(p); */
{
/* Create Child */
CTX_PTR c1; /* = AllocContext(p); */
@@
-435,7
+435,6
@@
static CTX_PTR CreateSuccessors(CPpmd7 *p, Bool skip)
SetSuccessor(ps[--numPs], REF(c1));
c = c1;
}
SetSuccessor(ps[--numPs], REF(c1));
c = c1;
}
- while (numPs != 0);
return c;
}
return c;
}
@@
-778,7
+777,7
@@
static void Range_Normalize(CPpmd7z_RangeDec *p)
if(p->Range >= p->Bottom)
break;
else
if(p->Range >= p->Bottom)
break;
else
- p->Range =
-p->Low
& (p->Bottom - 1);
+ p->Range =
((uint32_t)(-(int32_t)p->Low))
& (p->Bottom - 1);
}
p->Code = (p->Code << 8) | p->Stream->Read((void *)p->Stream);
p->Range <<= 8;
}
p->Code = (p->Code << 8) | p->Stream->Read((void *)p->Stream);
p->Range <<= 8;
@@
-991,7
+990,7
@@
static void RangeEnc_ShiftLow(CPpmd7z_RangeEnc *p)
p->Cache = (Byte)((UInt32)p->Low >> 24);
}
p->CacheSize++;
p->Cache = (Byte)((UInt32)p->Low >> 24);
}
p->CacheSize++;
- p->Low = (
UInt32)p->Low << 8
;
+ p->Low = (
(UInt32)p->Low << 8) & 0xFFFFFFFF
;
}
static void RangeEnc_Encode(CPpmd7z_RangeEnc *p, UInt32 start, UInt32 size, UInt32 total)
}
static void RangeEnc_Encode(CPpmd7z_RangeEnc *p, UInt32 start, UInt32 size, UInt32 total)