summaryrefslogtreecommitdiff
path: root/vcl/source/filter/graphicfilter2.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-08 16:42:58 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-09 09:23:59 +0200
commit93de4dc2d7d7ed079aaf57493c35609cf1b19fde (patch)
tree2c9ee877f374e695f038c2c882cf0af65195f5b5 /vcl/source/filter/graphicfilter2.cxx
parent8caf23a7f297bd18dc833146923432fab416b387 (diff)
clang-analyzer-deadcode.DeadStores
...follow-up to 63899beb6c033f4dc305a046c558c348a907ea40 "WaE: unused variable" removing the nVerticalSamplingFactor part Change-Id: I2830dc0647cf651014e1199ef62a7ea50e4a1719
Diffstat (limited to 'vcl/source/filter/graphicfilter2.cxx')
-rw-r--r--vcl/source/filter/graphicfilter2.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index d3ab1a7bbca9..f7b779e418c5 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -365,16 +365,18 @@ bool GraphicDescriptor::ImpDetectJPG( SvStream& rStm, bool bExtendedInfo )
sal_uInt16 nSamplesPerLine = 0;
sal_uInt8 nNumberOfImageComponents = 0;
sal_uInt8 nComponentsIdentifier = 0;
- sal_uInt8 nHorizontalSamplingFactor = 0;
+ sal_uInt8 nSamplingFactor = 0;
sal_uInt8 nQuantizationTableDestinationSelector = 0;
rStm.ReadUChar( nSamplePrecision )
.ReadUInt16( nNumberOfLines )
.ReadUInt16( nSamplesPerLine )
.ReadUChar( nNumberOfImageComponents )
.ReadUChar( nComponentsIdentifier )
- .ReadUChar( nHorizontalSamplingFactor )
+ .ReadUChar( nSamplingFactor )
.ReadUChar( nQuantizationTableDestinationSelector );
- nHorizontalSamplingFactor >>= 4;
+
+ // nSamplingFactor (lower nibble: vertial,
+ // upper nibble: horizontal) is unused
aPixSize.Height() = nNumberOfLines;
aPixSize.Width() = nSamplesPerLine;