Commit 2b470ff77c154caa7ab0153417ef46166d87db00
1 parent
f5cac93a
Remove 'this->' in SF_FlateLzwDecode.cc
Showing
1 changed file
with
19 additions
and
19 deletions
libqpdf/SF_FlateLzwDecode.cc
| ... | ... | @@ -31,9 +31,9 @@ SF_FlateLzwDecode::setDecodeParms(QPDFObjectHandle decode_parms) |
| 31 | 31 | QPDFObjectHandle value = decode_parms.getKey(key); |
| 32 | 32 | if (key == "/Predictor") { |
| 33 | 33 | if (value.isInteger()) { |
| 34 | - this->predictor = value.getIntValueAsInt(); | |
| 35 | - if (!((this->predictor == 1) || (this->predictor == 2) || | |
| 36 | - ((this->predictor >= 10) && (this->predictor <= 15)))) { | |
| 34 | + predictor = value.getIntValueAsInt(); | |
| 35 | + if (!((predictor == 1) || (predictor == 2) || | |
| 36 | + ((predictor >= 10) && (predictor <= 15)))) { | |
| 37 | 37 | filterable = false; |
| 38 | 38 | } |
| 39 | 39 | } else { |
| ... | ... | @@ -43,11 +43,11 @@ SF_FlateLzwDecode::setDecodeParms(QPDFObjectHandle decode_parms) |
| 43 | 43 | if (value.isInteger()) { |
| 44 | 44 | int val = value.getIntValueAsInt(); |
| 45 | 45 | if (key == "/Columns") { |
| 46 | - this->columns = val; | |
| 46 | + columns = val; | |
| 47 | 47 | } else if (key == "/Colors") { |
| 48 | - this->colors = val; | |
| 48 | + colors = val; | |
| 49 | 49 | } else if (key == "/BitsPerComponent") { |
| 50 | - this->bits_per_component = val; | |
| 50 | + bits_per_component = val; | |
| 51 | 51 | } |
| 52 | 52 | } else { |
| 53 | 53 | filterable = false; |
| ... | ... | @@ -55,7 +55,7 @@ SF_FlateLzwDecode::setDecodeParms(QPDFObjectHandle decode_parms) |
| 55 | 55 | } else if (lzw && (key == "/EarlyChange")) { |
| 56 | 56 | if (value.isInteger()) { |
| 57 | 57 | int earlychange = value.getIntValueAsInt(); |
| 58 | - this->early_code_change = (earlychange == 1); | |
| 58 | + early_code_change = (earlychange == 1); | |
| 59 | 59 | if (!((earlychange == 0) || (earlychange == 1))) { |
| 60 | 60 | filterable = false; |
| 61 | 61 | } |
| ... | ... | @@ -65,7 +65,7 @@ SF_FlateLzwDecode::setDecodeParms(QPDFObjectHandle decode_parms) |
| 65 | 65 | } |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if ((this->predictor > 1) && (this->columns == 0)) { | |
| 68 | + if ((predictor > 1) && (columns == 0)) { | |
| 69 | 69 | filterable = false; |
| 70 | 70 | } |
| 71 | 71 | |
| ... | ... | @@ -76,27 +76,27 @@ Pipeline* |
| 76 | 76 | SF_FlateLzwDecode::getDecodePipeline(Pipeline* next) |
| 77 | 77 | { |
| 78 | 78 | std::shared_ptr<Pipeline> pipeline; |
| 79 | - if ((this->predictor >= 10) && (this->predictor <= 15)) { | |
| 79 | + if ((predictor >= 10) && (predictor <= 15)) { | |
| 80 | 80 | QTC::TC("qpdf", "SF_FlateLzwDecode PNG filter"); |
| 81 | 81 | pipeline = std::make_shared<Pl_PNGFilter>( |
| 82 | 82 | "png decode", |
| 83 | 83 | next, |
| 84 | 84 | Pl_PNGFilter::a_decode, |
| 85 | - QIntC::to_uint(this->columns), | |
| 86 | - QIntC::to_uint(this->colors), | |
| 87 | - QIntC::to_uint(this->bits_per_component)); | |
| 88 | - this->pipelines.push_back(pipeline); | |
| 85 | + QIntC::to_uint(columns), | |
| 86 | + QIntC::to_uint(colors), | |
| 87 | + QIntC::to_uint(bits_per_component)); | |
| 88 | + pipelines.push_back(pipeline); | |
| 89 | 89 | next = pipeline.get(); |
| 90 | - } else if (this->predictor == 2) { | |
| 90 | + } else if (predictor == 2) { | |
| 91 | 91 | QTC::TC("qpdf", "SF_FlateLzwDecode TIFF predictor"); |
| 92 | 92 | pipeline = std::make_shared<Pl_TIFFPredictor>( |
| 93 | 93 | "tiff decode", |
| 94 | 94 | next, |
| 95 | 95 | Pl_TIFFPredictor::a_decode, |
| 96 | - QIntC::to_uint(this->columns), | |
| 97 | - QIntC::to_uint(this->colors), | |
| 98 | - QIntC::to_uint(this->bits_per_component)); | |
| 99 | - this->pipelines.push_back(pipeline); | |
| 96 | + QIntC::to_uint(columns), | |
| 97 | + QIntC::to_uint(colors), | |
| 98 | + QIntC::to_uint(bits_per_component)); | |
| 99 | + pipelines.push_back(pipeline); | |
| 100 | 100 | next = pipeline.get(); |
| 101 | 101 | } |
| 102 | 102 | |
| ... | ... | @@ -105,7 +105,7 @@ SF_FlateLzwDecode::getDecodePipeline(Pipeline* next) |
| 105 | 105 | } else { |
| 106 | 106 | pipeline = std::make_shared<Pl_Flate>("stream inflate", next, Pl_Flate::a_inflate); |
| 107 | 107 | } |
| 108 | - this->pipelines.push_back(pipeline); | |
| 108 | + pipelines.push_back(pipeline); | |
| 109 | 109 | return pipeline.get(); |
| 110 | 110 | } |
| 111 | 111 | ... | ... |