RepositoryExternal.mk | 2 +- vcl/source/edit/texteng.cxx | 3 +-- vcl/source/filter/graphicfilter.cxx | 4 ---- vcl/source/filter/graphicfilter2.cxx | 12 +++++------- 4 files changed, 7 insertions(+), 14 deletions(-)
New commits: commit 6b4c435b1b642eee249dfd6212f161c6f8398d95 Author: Stephan Bergmann <[email protected]> Date: Fri Oct 9 09:21:48 2015 +0200 external/openldap's include/lber_types.h is generated during build ...from include/lber_types.hin. So fix dependencies after cad68c6559a350aadbb1d3b2fcc8d78d1851b057 "relax deps of link target on external projects." Change-Id: I1c002b063c53f82ff18d11577a99f7413f7fb7a5 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5a655e2..e0e3a39 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2800,7 +2800,7 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,openldap/include) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_use_external_project,$(1),openldap) +$(call gb_LinkTarget_use_external_project,$(1),openldap,full) $(call gb_LinkTarget_add_libs,$(1), \ $(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs/libldap.a \ $(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs/liblber.a \ commit dfd3d6644aa42d77b2108fab72ce34022d88dfeb Author: Stephan Bergmann <[email protected]> Date: Thu Oct 8 16:57:03 2015 +0200 clang-analyzer-deadcode.DeadStores Change-Id: Iad11e6bcb64976c7eb4181ee327602e6c3a7e26f diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index f7b779e..1e52932 100644 --- a/vcl/source/filter/graphicfilter2.cxx +++ b/vcl/source/filter/graphicfilter2.cxx @@ -684,7 +684,6 @@ bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ) rStm.ReadUInt32( nTemp32 ); aPixSize.Width() = nTemp32; } - nCount += 12; // height rStm.SeekRel( 2 ); @@ -701,7 +700,6 @@ bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ) rStm.ReadUInt32( nTemp32 ); aPixSize.Height() = nTemp32; } - nCount += 12; // Bits/Pixel rStm.ReadUInt16( nTemp16 ); @@ -711,7 +709,6 @@ bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ) rStm.ReadUInt16( nTemp16 ); nBitsPerPixel = nTemp16; rStm.SeekRel( 2 ); - nCount += 12; } else rStm.SeekRel( -2 ); @@ -724,7 +721,6 @@ bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, bool bExtendedInfo ) rStm.ReadUInt16( nTemp16 ); bCompressed = ( nTemp16 > 1 ); rStm.SeekRel( 2 ); - nCount += 12; } else rStm.SeekRel( -2 ); commit 93de4dc2d7d7ed079aaf57493c35609cf1b19fde Author: Stephan Bergmann <[email protected]> Date: Thu Oct 8 16:42:58 2015 +0200 clang-analyzer-deadcode.DeadStores ...follow-up to 63899beb6c033f4dc305a046c558c348a907ea40 "WaE: unused variable" removing the nVerticalSamplingFactor part Change-Id: I2830dc0647cf651014e1199ef62a7ea50e4a1719 diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx index d3ab1a7..f7b779e 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; commit 8caf23a7f297bd18dc833146923432fab416b387 Author: Stephan Bergmann <[email protected]> Date: Thu Oct 8 16:38:21 2015 +0200 clang-analyzer-deadcode.DeadStores Change-Id: Ic2d49519475db8292fecf18eb5c90a74ace8dfe7 diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index f9b86cd..e54a171 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -614,7 +614,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, } else if( rFormatExtension.startsWith( "XPM" ) ) { - bSomethingTested = true; return true; } @@ -639,7 +638,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, } else if( rFormatExtension.startsWith( "XBM" ) ) { - bSomethingTested = true; return true; } @@ -725,7 +723,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, } else if( rFormatExtension.startsWith( "SVG" ) ) { - bSomethingTested = true; return true; } @@ -767,7 +764,6 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension, (sFirstBytes[ 4 ] == 'm' && sFirstBytes[ 5 ] == 'o' && sFirstBytes[ 6 ] == 'o' && sFirstBytes[ 7 ] == 'v' && sFirstBytes[ 11 ] == 'l' && sFirstBytes[ 12 ] == 'm')) { - bSomethingTested=true; rFormatExtension = "MOV"; return true; } commit cb680992d256e01494956b25f3f3517f63c2e558 Author: Stephan Bergmann <[email protected]> Date: Thu Oct 8 16:36:00 2015 +0200 clang-analyzer-deadcode.DeadStores Change-Id: I68ab6da7c90b869499f1b7a4d2433dac77d36889 diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 1815e43..316ee8d 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -2531,7 +2531,7 @@ bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, bool bHTML else { sal_Int32 nTmpStart = nStartPos; - sal_Int32 nTmpEnd = nEndPos; + sal_Int32 nTmpEnd; do { const TextCharAttrib* pAttr = pNode->GetCharAttribs().FindNextAttrib( TEXTATTR_HYPERLINK, nTmpStart, nEndPos ); commit 93d499df007cbde03222e6302168cbeb16bf9b6e Author: Stephan Bergmann <[email protected]> Date: Thu Oct 8 16:35:47 2015 +0200 clang-analyzer-deadcode.DeadStores Change-Id: I499f00e13543d2191008a0d7a4aa0391d6889315 diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index e3ad74f..1815e43 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -912,7 +912,6 @@ Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, bool bSpecial, bool bP pLine = & ( pPortion->GetLines().back() ); nY -= mnCharHeight; - nCurIndex = nCurIndex - pLine->GetLen(); } Rectangle aEditCursor; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
