From b7729d74eb49cc48f1aa1bab38ed840f963d40d5 Mon Sep 17 00:00:00 2001 From: Jeremiah LaRocco Date: Tue, 9 Apr 2019 18:13:05 -0600 Subject: [PATCH 1/4] 1192 Update bundled OpenJPEG to v2.3.1 to fix regression in v2.3.0 --- earth_enterprise/src/third_party/openjpeg/SConscript | 2 +- earth_enterprise/third_party/openjpeg/openjpeg-2.3.0.tar.gz | 3 --- earth_enterprise/third_party/openjpeg/openjpeg-2.3.1.tar.gz | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 earth_enterprise/third_party/openjpeg/openjpeg-2.3.0.tar.gz create mode 100644 earth_enterprise/third_party/openjpeg/openjpeg-2.3.1.tar.gz diff --git a/earth_enterprise/src/third_party/openjpeg/SConscript b/earth_enterprise/src/third_party/openjpeg/SConscript index 859b74db41..34dc2b3791 100644 --- a/earth_enterprise/src/third_party/openjpeg/SConscript +++ b/earth_enterprise/src/third_party/openjpeg/SConscript @@ -17,7 +17,7 @@ Import('third_party_env') -openjpeg_version = 'openjpeg-2.3.0' +openjpeg_version = 'openjpeg-2.3.1' #ge_version = openjpeg_version.replace('curl', 'curl-ge') num_cpu = GetOption('num_jobs') diff --git a/earth_enterprise/third_party/openjpeg/openjpeg-2.3.0.tar.gz b/earth_enterprise/third_party/openjpeg/openjpeg-2.3.0.tar.gz deleted file mode 100644 index 9d6cea958b..0000000000 --- a/earth_enterprise/third_party/openjpeg/openjpeg-2.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c3d7548c5385f6ec870b67ba7a2996b6d67a6cfbf8621a8a0297e2ffaf3716e -size 2224847 diff --git a/earth_enterprise/third_party/openjpeg/openjpeg-2.3.1.tar.gz b/earth_enterprise/third_party/openjpeg/openjpeg-2.3.1.tar.gz new file mode 100644 index 0000000000..eead269c2b --- /dev/null +++ b/earth_enterprise/third_party/openjpeg/openjpeg-2.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63f5a4713ecafc86de51bfad89cc07bb788e9bba24ebbf0c4ca637621aadb6a9 +size 2214401 From 924af42c1ba5affd4927599f957fbf0f81e0cc2e Mon Sep 17 00:00:00 2001 From: Jeremiah LaRocco Date: Thu, 11 Apr 2019 11:29:34 -0600 Subject: [PATCH 2/4] 1192 Update release notes --- docs/geedocs/5.3.0/answer/7160007.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/geedocs/5.3.0/answer/7160007.html b/docs/geedocs/5.3.0/answer/7160007.html index 245fa16de1..bf5998d411 100644 --- a/docs/geedocs/5.3.0/answer/7160007.html +++ b/docs/geedocs/5.3.0/answer/7160007.html @@ -143,6 +143,13 @@
Added a validity check that ensures a valid date is entered. A date of 0000-00-00 can also be entered as a default value. The user will not be allowed to save with an invalid date entered. + + 1192 + Fusion fails to create a resource from certain jp2 files + + Upgrade bundled OpenJPEG to v2.3.1 to fix regression introduced in v2.3.0 that affected certain .jp2 files. + + 1210 Fix Xerces-related memory leaks From 5c8fbb769c226d9c6c67100870deed83373630e8 Mon Sep 17 00:00:00 2001 From: Jeremiah LaRocco Date: Thu, 11 Apr 2019 14:57:12 -0600 Subject: [PATCH 3/4] 1192 Rename gdal-jp2-V2.3.0.patch to reflect new OpenJPEG version. --- .../gdal/{gdal-jp2-V2.3.0.patch => gdal-jp2-V2.3.1.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename earth_enterprise/src/third_party/gdal/{gdal-jp2-V2.3.0.patch => gdal-jp2-V2.3.1.patch} (100%) diff --git a/earth_enterprise/src/third_party/gdal/gdal-jp2-V2.3.0.patch b/earth_enterprise/src/third_party/gdal/gdal-jp2-V2.3.1.patch similarity index 100% rename from earth_enterprise/src/third_party/gdal/gdal-jp2-V2.3.0.patch rename to earth_enterprise/src/third_party/gdal/gdal-jp2-V2.3.1.patch From eeb4141073c4a9c941583897ae4009a6f2af93af Mon Sep 17 00:00:00 2001 From: Jeremiah LaRocco Date: Thu, 11 Apr 2019 15:04:50 -0600 Subject: [PATCH 4/4] 1192 Fix SConscript to use correct OpenJPEG patch. --- earth_enterprise/src/third_party/gdal/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/earth_enterprise/src/third_party/gdal/SConscript b/earth_enterprise/src/third_party/gdal/SConscript index f89d311e8f..2470ae8e7b 100644 --- a/earth_enterprise/src/third_party/gdal/SConscript +++ b/earth_enterprise/src/third_party/gdal/SConscript @@ -58,7 +58,7 @@ gdal_env = third_party_env.DeepCopy() optdir = gdal_env['optdir'] root_dir = Dir(gdal_env.exportdirs['root']).abspath -gdal_patches = ['gdal-jp2-V2.3.0.patch'] +gdal_patches = ['gdal-jp2-V2.3.1.patch'] if GetOption('clean'): gdal_env.Execute('rm -rf %s' % current_dir)