← Back to branch summary

~ubuntu-branches/ubuntu/wily/libwpd/wily-proposed

« back to all changes in this revision

Viewing changes to src/lib/WP3Part.cpp

  • Committer: Package Import Robot
  • Author(s): Rene Engelhard
  • Date: 2014-08-08 00:35:26 UTC
  • mfrom: (11.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20140808003526-7pku3062w50cnsod
Tags: 0.10.0-2
* upload to unstable

* fix debian/copyright for MPL-2.0 | LGPL-2.1+ dual-license 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/WP3Part.cpp
34
34
// returns the part if it successfully creates the part, returns 0 if it can't
35
35
// throws an exception if there is an error
36
36
// precondition: readVal is between 0xC0 and 0xEF
37
 
WP3Part *WP3Part::constructPart(WPXInputStream *input, WPXEncryption *encryption, const uint8_t readVal)
 
37
WP3Part *WP3Part::constructPart(librevenge::RVNGInputStream *input, WPXEncryption *encryption, const unsigned char readVal)
38
38
{
39
39
        WPD_DEBUG_MSG(("WordPerfect: ConstructPart for group 0x%x\n", readVal));
40
40
 
41
 
        if (readVal >= (uint8_t)0x80 && readVal <= (uint8_t)0xBF)
 
41
        if (readVal >= (unsigned char)0x80 && readVal <= (unsigned char)0xBF)
42
42
        {
43
43
                // single-byte function
44
44
                WPD_DEBUG_MSG(("WordPerfect: constructSingleByteFunction(input, val)\n"));
45
45
                return WP3SingleByteFunction::constructSingleByteFunction(input, encryption, readVal);
46
46
        }
47
 
        else if (readVal >= (uint8_t)0xC0 && readVal <= (uint8_t)0xCF)
 
47
        else if (readVal >= (unsigned char)0xC0 && readVal <= (unsigned char)0xCF)
48
48
        {
49
49
                // fixed length multi-byte function
50
50
 
56
56
                WPD_DEBUG_MSG(("WordPerfect: constructFixedLengthGroup(input, val)\n"));
57
57
                return WP3FixedLengthGroup::constructFixedLengthGroup(input, encryption, readVal);
58
58
        }
59
 
        else if (readVal >= (uint8_t)0xD0 && readVal <= (uint8_t)0xEF)
 
59
        else if (readVal >= (unsigned char)0xD0 && readVal <= (unsigned char)0xEF)
60
60
        {
61
61
                // variable length multi-byte function
62
62