mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:50:26 +08:00
5f3249e50e
* Fix for openjpeg issue 16645 compile with VS2019 16.9.1
- Modified portfile.cmake to apply patch
fix-lrintf-to-opj_lrintf.patch
- Added patch to change /src/lib/openmj2/opj_includes.h
From: static INLINE long lrintf(float f)
To: static INLINE long opj_lrintf(float f)
- Converted CONTROL file to vcpkg.json file
- Fix was tested locally on triplet x64-windows with
Microsoft Windows x64 Professional 20H2 [Version 10.0.19042.867]
Windows Feature Experience Pack 120.2212.551.0
Windows SDK [Version 10.0.19041.0]
VS 2017:
Visual Studio 2017 Community Edition [Version 15.9.34]
Visual Studio Toolset [Version 14.16.27023]
Microsoft (R) C/C++ Optimizing Compiler [Version 19.16.27045 for x64]
VS 2019:
Visual Studio 2019 Community Edition [Version 16.9.1]
Visual Studio Toolset [Version 14.28.29910]
Microsoft (R) C/C++ Optimizing Compiler [Version 19.28.29912 for x64]
* Update json file
* Reformat vcpkg.json file
* Update port version
* Update json file
* Update ports/openjpeg/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update ports/openjpeg/vcpkg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/baseline.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/o-/openjpeg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update json file
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
14 lines
509 B
Diff
14 lines
509 B
Diff
diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h
|
|
index 340e8a9..11bb0e4 100644
|
|
--- a/src/lib/openmj2/opj_includes.h
|
|
+++ b/src/lib/openmj2/opj_includes.h
|
|
@@ -93,7 +93,7 @@ Most compilers implement their own version of this keyword ...
|
|
|
|
/* MSVC and Borland C do not have lrintf */
|
|
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
|
-static INLINE long lrintf(float f)
|
|
+static INLINE long opj_lrintf(float f)
|
|
{
|
|
#ifdef _M_X64
|
|
return (long)((f > 0.0f) ? (f + 0.5f) : (f - 0.5f));
|