~ubuntu-branches/ubuntu/utopic/unrar-nonfree/utopic

« back to all changes in this revision

Viewing changes to model.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Martin Meredith
  • Date: 2009-06-06 17:46:05 UTC
  • mfrom: (1.1.11 upstream) (5.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090606174605-h4ciqxlpy39jmjx0
Tags: 1:3.9.3-1
* New upstream release
* Updated Copyright file (Closes: #531432)

Show diffs side-by-side

added added

removed removed

Lines of Context:
400
400
  STATE* p=U.Stats;
401
401
  int i, HiCnt;
402
402
  int count=Model->Coder.GetCurrentCount();
403
 
  if (count>=Model->Coder.SubRange.scale)
 
403
  if (count>=(int)Model->Coder.SubRange.scale)
404
404
    return(false);
405
405
  if (count < (HiCnt=p->Freq)) 
406
406
  {
489
489
  } while ( --i );
490
490
  Model->Coder.SubRange.scale += HiCnt;
491
491
  count=Model->Coder.GetCurrentCount();
492
 
  if (count>=Model->Coder.SubRange.scale)
 
492
  if (count>=(int)Model->Coder.SubRange.scale)
493
493
    return(false);
494
494
  p=*(pps=ps);
495
495
  if (count < HiCnt) 
540
540
bool ModelPPM::DecodeInit(Unpack *UnpackRead,int &EscChar)
541
541
{
542
542
  int MaxOrder=UnpackRead->GetChar();
543
 
  bool Reset=MaxOrder & 0x20;
 
543
  bool Reset=(MaxOrder & 0x20)!=0;
544
544
 
545
545
  int MaxMB;
546
546
  if (Reset)