Date: Tue, 17 Mar 2020 22:19:14 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528605 - head/graphics/libfpx/files Message-ID: <202003172219.02HMJEww080320@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Tue Mar 17 22:19:14 2020 New Revision: 528605 URL: https://svnweb.freebsd.org/changeset/ports/528605 Log: Unbreak the port for users of -Werror -- the code stopped qualifying for WARNS=3 a while ago, because it relies on implicit copy-constructors, which are deprecated in some cases since c++11. Fix another kind of warning by correcting the indentation. No PORTREVISION bump because the changes are superficial -- resulting binary remains the same. Reported by: pkg-fallout Tested with: llvm10 Added: head/graphics/libfpx/files/patch-warnings (contents, props changed) Modified: head/graphics/libfpx/files/Makefile.bsd Modified: head/graphics/libfpx/files/Makefile.bsd ============================================================================== --- head/graphics/libfpx/files/Makefile.bsd Tue Mar 17 22:12:02 2020 (r528604) +++ head/graphics/libfpx/files/Makefile.bsd Tue Mar 17 22:19:14 2020 (r528605) @@ -2,7 +2,7 @@ LIB = fpx INCS = fpxlib.h SHLIB_MAJOR= 2 SHLIB_MINOR= 7 -WARNS= 3 +WARNS= 2 LIBDIR = ${PREFIX}/lib INCSDIR = ${PREFIX}/include Added: head/graphics/libfpx/files/patch-warnings ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libfpx/files/patch-warnings Tue Mar 17 22:19:14 2020 (r528605) @@ -0,0 +1,20 @@ +Shift indentation to avoid the "misleading indentation" warning +from LLVM10. I admit, that the original author's intent escapes +me here, so I cannot tell, if we have an actual bug remaining +in this code. + + -mi + +--- fpx/ptil_fpx.cpp 2013-09-02 11:45:00.000000000 -0400 ++++ fpx/ptil_fpx.cpp 2020-03-17 18:11:00.425447000 -0400 +@@ -1200,7 +1200,7 @@ + pixelsSpace = tmpPixelSpace; + } +- imageParam->GetContrast( &contrastValue); +- Contrast( contrastValue, pixelsSpace, pixels, width * height); +- } ++ imageParam->GetContrast( &contrastValue); ++ Contrast( contrastValue, pixelsSpace, pixels, width * height); ++ } + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003172219.02HMJEww080320>