diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-25 07:36:27 +0100 |
| commit | 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch) | |
| tree | 6208a7f4fc744684fce0f55acbb47511acace498 /sci-libs/gdal/files | |
| parent | 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff) | |
gentoo resync : 25.08.2018
Diffstat (limited to 'sci-libs/gdal/files')
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch | 80 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch | 12 | ||||
| -rw-r--r-- | sci-libs/gdal/files/gdal-2.3.0-libtiff.patch | 12 |
3 files changed, 104 insertions, 0 deletions
diff --git a/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch new file mode 100644 index 000000000000..3f681836989f --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.0-changeset_38658.patch @@ -0,0 +1,80 @@ +Index: /trunk/gdal/frmts/nitf/nitfrasterband.cpp
+===================================================================
+--- a/frmts/nitf/nitfrasterband.cpp (revision 38657)
++++ b/frmts/nitf/nitfrasterband.cpp (revision 38658)
+@@ -824,4 +826,20 @@
+ pUnpackData[i+7] = ((pDataSrc[k+2]) & 0x7);
+ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 5));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] >> 2) & 0x07);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+0] << 1) & 0x07) | (pDataSrc[k+1] >> 7);
++ if( i + 3 < n )
++ pUnpackData[i+3] = ((pDataSrc[k+1] >> 4) & 0x07);
++ if( i + 4 < n )
++ pUnpackData[i+4] = ((pDataSrc[k+1] >> 1) & 0x07);
++ if( i + 5 < n )
++ pUnpackData[i+5] = ((pDataSrc[k+1] << 2) & 0x07) | (pDataSrc[k+2] >> 6);
++ if( i + 6 < n )
++ pUnpackData[i+6] = ((pDataSrc[k+2] >> 3) & 0x07);
++ }
+
+ memcpy(pData, pUnpackData, n);
+@@ -842,4 +862,20 @@
+ pUnpackData[i+7] = ((pDataSrc[k+4]) & 0x1f);
+ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 3));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] << 2) & 0x1f) | (pDataSrc[k+1] >> 6);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+1] >> 1) & 0x1f);
++ if( i + 3 < n )
++ pUnpackData[i+3] = ((pDataSrc[k+1] << 4) & 0x1f) | (pDataSrc[k+2] >> 4);
++ if( i + 4 < n )
++ pUnpackData[i+4] = ((pDataSrc[k+2] << 1) & 0x1f) | (pDataSrc[k+3] >> 7);
++ if( i + 5 < n )
++ pUnpackData[i+5] = ((pDataSrc[k+3] >> 2) & 0x1f);
++ if( i + 6 < n )
++ pUnpackData[i+6] = ((pDataSrc[k+3] << 3) & 0x1f) | (pDataSrc[k+4] >> 5);
++ }
+
+ memcpy(pData, pUnpackData, n);
+@@ -856,4 +894,12 @@
+ pUnpackData[i+3] = ((pDataSrc[k+2]) & 0x3f);
+ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 2));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] << 4) & 0x3f) | (pDataSrc[k+1] >> 4);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+1] << 2) & 0x3f) | (pDataSrc[k+2] >> 6);
++ }
+
+ memcpy(pData, pUnpackData, n);
+@@ -873,4 +921,20 @@
+ pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
+ pUnpackData[i+7] = ((pDataSrc[k+6]) & 0x7f);
++ }
++ if( i < n )
++ {
++ pUnpackData[i+0] = ((pDataSrc[k+0] >> 1));
++ if( i + 1 < n )
++ pUnpackData[i+1] = ((pDataSrc[k+0] << 6) & 0x7f) | (pDataSrc[k+1] >> 2);
++ if( i + 2 < n )
++ pUnpackData[i+2] = ((pDataSrc[k+1] << 5) & 0x7f) | (pDataSrc[k+2] >> 3) ;
++ if( i + 3 < n )
++ pUnpackData[i+3] = ((pDataSrc[k+2] << 4) & 0x7f) | (pDataSrc[k+3] >> 4);
++ if( i + 4 < n )
++ pUnpackData[i+4] = ((pDataSrc[k+3] << 3) & 0x7f) | (pDataSrc[k+4] >> 5);
++ if( i + 5 < n )
++ pUnpackData[i+5] = ((pDataSrc[k+4] << 2) & 0x7f) | (pDataSrc[k+5] >> 6);
++ if( i + 6 < n )
++ pUnpackData[i+6] = ((pDataSrc[k+5] << 1) & 0x7f) | (pDataSrc[k+6] >> 7);
+ }
+
diff --git a/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch new file mode 100644 index 000000000000..783752e0efa6 --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.0-frmts-nitf38234.patch @@ -0,0 +1,12 @@ +Index: trunk/gdal/frmts/nitf/nitffile.c
+===================================================================
+--- a/frmts/nitf/nitffile.c (revision 38085)
++++ b/frmts/nitf/nitffile.c (revision 38234)
+@@ -350,5 +350,6 @@
+ if (nOffset != -1)
+ nOffset = NITFCollectSegmentInfo( psFile, nHeaderLen, nOffset, "RE", 4, 7, &nNextData);
+- else
++
++ if( nOffset < 0 )
+ {
+ NITFClose(psFile);
diff --git a/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch new file mode 100644 index 000000000000..5964165e3e6f --- /dev/null +++ b/sci-libs/gdal/files/gdal-2.3.0-libtiff.patch @@ -0,0 +1,12 @@ +--- ./frmts/gtiff/libtiff/tif_read.c.old 2018-08-11 09:12:42.378891934 +0100 ++++ ./frmts/gtiff/libtiff/tif_read.c 2018-08-11 09:15:37.330882891 +0100 +@@ -296,7 +296,8 @@ + } + else + { +- return 1; ++ tif->tif_rawcc = tif->tif_rawdataloaded; ++ return 1; + } + } + |