From fc09af763c96d0bf13d721e1f74b8535379df766 Mon Sep 17 00:00:00 2001
From: Anchor <none@none>
Date: Thu, 18 Apr 2019 13:24:14 -0700
Subject: [PATCH] [DRTVWR-476] - update openjpeg
---
autobuild.xml | 12 ++++++------
indra/cmake/Copy3rdPartyLibs.cmake | 2 +-
indra/cmake/OpenJPEG.cmake | 4 ++--
indra/llimagej2coj/llimagej2coj.cpp | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 0f68acd3e22..49c3069d058 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2652,9 +2652,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>8f0d541312c0b7a55a0f6295be42a395</string>
+ <string>49f2a20ecd50c29a66a162d8bbc5cbe6</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31394/263395/openjpeg-2.3.0.523914-darwin64-523914.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/36010/301207/openjpeg-1.5.1.526451-darwin64-526451.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -2688,9 +2688,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>6bb7c289ab7ca9d973f29115c574e54a</string>
+ <string>7ce7dd714c6899ffc4a7473fd578bee0</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31433/263554/openjpeg-2.3.0.523914-windows-523914.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/36015/301223/openjpeg-1.5.1.526451-windows-526451.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -2700,9 +2700,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
- <string>891c7e483024f6827d1ed26c91b0b868</string>
+ <string>f024340804396106687fe7a863d5952f</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/31432/263547/openjpeg-2.3.0.523914-windows64-523914.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/36012/301214/openjpeg-1.5.1.526451-windows64-526451.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index e2647f6b987..e121328d644 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -37,7 +37,7 @@ if(WINDOWS)
set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
set(release_files
- openjp2.dll
+ openjpeg.dll
libapr-1.dll
libaprutil-1.dll
libapriconv-1.dll
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 965384f5e0e..bf0bde2ba7b 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -12,8 +12,8 @@ else (USESYSTEMLIBS)
if(WINDOWS)
# Windows has differently named release and debug openjpeg(d) libs.
set(OPENJPEG_LIBRARIES
- debug openjp2d
- optimized openjp2)
+ debug openjpegd
+ optimized openjpeg)
else(WINDOWS)
set(OPENJPEG_LIBRARIES openjpeg)
endif(WINDOWS)
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 3fe5d56d4fa..925da5674bf 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -28,7 +28,7 @@
#include "llimagej2coj.h"
// this is defined so that we get static linking.
-#include "opj_includes.h"
+#include "openjpeg.h"
#include "lltimer.h"
//#include "llmemory.h"
--
GitLab