Fix FTBFS
This commit is contained in:
Jon Ciesla
parent
95aee2203e
commit
260b0fc7c8
@ -1,7 +1,7 @@
|
|||||||
Summary: Library for reading RAW files obtained from digital photo cameras
|
Summary: Library for reading RAW files obtained from digital photo cameras
|
||||||
Name: LibRaw
|
Name: LibRaw
|
||||||
Version: 0.17.1
|
Version: 0.17.1
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://www.libraw.org
|
URL: http://www.libraw.org
|
||||||
@ -14,6 +14,7 @@ Source1: http://www.libraw.org/data/%{name}-demosaic-pack-GPL2-%{version}.tar.gz
|
|||||||
Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz
|
Source2: http://www.libraw.org/data/%{name}-demosaic-pack-GPL3-%{version}.tar.gz
|
||||||
Patch0: LibRaw-0.6.0-pkgconfig.patch
|
Patch0: LibRaw-0.6.0-pkgconfig.patch
|
||||||
Patch1: LibRaw-0.17.1-CVE-2015-8366-8367.patch
|
Patch1: LibRaw-0.17.1-CVE-2015-8366-8367.patch
|
||||||
|
Patch2: dcraw_narrowing.patch
|
||||||
|
|
||||||
Provides: bundled(dcraw) = 9.25
|
Provides: bundled(dcraw) = 9.25
|
||||||
|
|
||||||
@ -54,6 +55,7 @@ LibRaw sample programs
|
|||||||
|
|
||||||
%patch0 -p0 -b .pkgconfig
|
%patch0 -p0 -b .pkgconfig
|
||||||
%patch1 -p1 -b .CVE-2015-8366
|
%patch1 -p1 -b .CVE-2015-8366
|
||||||
|
%patch2 -p0
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-examples=yes --enable-jasper --enable-lcms \
|
%configure --enable-examples=yes --enable-jasper --enable-lcms \
|
||||||
@ -96,6 +98,9 @@ make install DESTDIR=%{buildroot}
|
|||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 22 2016 Jon Ciesla <limburgher@gmail.com> - 0.17.1-4
|
||||||
|
- Patch to fix FTBFS, BZ 1307280.
|
||||||
|
|
||||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.1-3
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.1-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
81
dcraw_narrowing.patch
Normal file
81
dcraw_narrowing.patch
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
--- internal/dcraw_common.cpp
|
||||||
|
+++ internal/dcraw_common.cpp
|
||||||
|
@@ -4417,30 +4417,37 @@ void CLASS lin_interpolate()
|
||||||
|
*/
|
||||||
|
void CLASS vng_interpolate()
|
||||||
|
{
|
||||||
|
- static const signed char *cp, terms[] = {
|
||||||
|
- -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01,
|
||||||
|
- -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01,
|
||||||
|
- -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,
|
||||||
|
- -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,
|
||||||
|
- -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,
|
||||||
|
- -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,
|
||||||
|
- -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,
|
||||||
|
- -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,
|
||||||
|
- -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,
|
||||||
|
- -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,
|
||||||
|
- -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,
|
||||||
|
- -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,
|
||||||
|
- -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,
|
||||||
|
- +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,
|
||||||
|
- +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,
|
||||||
|
- +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,
|
||||||
|
- +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,
|
||||||
|
- +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,
|
||||||
|
- +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,
|
||||||
|
- +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,
|
||||||
|
- +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,
|
||||||
|
- +1,+0,+2,+1,0,0x10
|
||||||
|
- }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
|
||||||
|
+ struct interpolate_terms {
|
||||||
|
+ signed char y1, x1, y2, x2, weight;
|
||||||
|
+ unsigned char grads;
|
||||||
|
+ };
|
||||||
|
+ static const interpolate_terms terms[] = {
|
||||||
|
+ {-2,-2,+0,-1,0,0x01}, {-2,-2,+0,+0,1,0x01}, {-2,-1,-1,+0,0,0x01},
|
||||||
|
+ {-2,-1,+0,-1,0,0x02}, {-2,-1,+0,+0,0,0x03}, {-2,-1,+0,+1,1,0x01},
|
||||||
|
+ {-2,+0,+0,-1,0,0x06}, {-2,+0,+0,+0,1,0x02}, {-2,+0,+0,+1,0,0x03},
|
||||||
|
+ {-2,+1,-1,+0,0,0x04}, {-2,+1,+0,-1,1,0x04}, {-2,+1,+0,+0,0,0x06},
|
||||||
|
+ {-2,+1,+0,+1,0,0x02}, {-2,+2,+0,+0,1,0x04}, {-2,+2,+0,+1,0,0x04},
|
||||||
|
+ {-1,-2,-1,+0,0,0x80}, {-1,-2,+0,-1,0,0x01}, {-1,-2,+1,-1,0,0x01},
|
||||||
|
+ {-1,-2,+1,+0,1,0x01}, {-1,-1,-1,+1,0,0x88}, {-1,-1,+1,-2,0,0x40},
|
||||||
|
+ {-1,-1,+1,-1,0,0x22}, {-1,-1,+1,+0,0,0x33}, {-1,-1,+1,+1,1,0x11},
|
||||||
|
+ {-1,+0,-1,+2,0,0x08}, {-1,+0,+0,-1,0,0x44}, {-1,+0,+0,+1,0,0x11},
|
||||||
|
+ {-1,+0,+1,-2,1,0x40}, {-1,+0,+1,-1,0,0x66}, {-1,+0,+1,+0,1,0x22},
|
||||||
|
+ {-1,+0,+1,+1,0,0x33}, {-1,+0,+1,+2,1,0x10}, {-1,+1,+1,-1,1,0x44},
|
||||||
|
+ {-1,+1,+1,+0,0,0x66}, {-1,+1,+1,+1,0,0x22}, {-1,+1,+1,+2,0,0x10},
|
||||||
|
+ {-1,+2,+0,+1,0,0x04}, {-1,+2,+1,+0,1,0x04}, {-1,+2,+1,+1,0,0x04},
|
||||||
|
+ {+0,-2,+0,+0,1,0x80}, {+0,-1,+0,+1,1,0x88}, {+0,-1,+1,-2,0,0x40},
|
||||||
|
+ {+0,-1,+1,+0,0,0x11}, {+0,-1,+2,-2,0,0x40}, {+0,-1,+2,-1,0,0x20},
|
||||||
|
+ {+0,-1,+2,+0,0,0x30}, {+0,-1,+2,+1,1,0x10}, {+0,+0,+0,+2,1,0x08},
|
||||||
|
+ {+0,+0,+2,-2,1,0x40}, {+0,+0,+2,-1,0,0x60}, {+0,+0,+2,+0,1,0x20},
|
||||||
|
+ {+0,+0,+2,+1,0,0x30}, {+0,+0,+2,+2,1,0x10}, {+0,+1,+1,+0,0,0x44},
|
||||||
|
+ {+0,+1,+1,+2,0,0x10}, {+0,+1,+2,-1,1,0x40}, {+0,+1,+2,+0,0,0x60},
|
||||||
|
+ {+0,+1,+2,+1,0,0x20}, {+0,+1,+2,+2,0,0x10}, {+1,-2,+1,+0,0,0x80},
|
||||||
|
+ {+1,-1,+1,+1,0,0x88}, {+1,+0,+1,+2,0,0x08}, {+1,+0,+2,-1,0,0x40},
|
||||||
|
+ {+1,+0,+2,+1,0,0x10}
|
||||||
|
+ };
|
||||||
|
+ const interpolate_terms *cpt;
|
||||||
|
+ signed char *cp;
|
||||||
|
+ signed char chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };
|
||||||
|
ushort (*brow[5])[4], *pix;
|
||||||
|
int prow=8, pcol=2, *ip, *code[16][16], gval[8], gmin, gmax, sum[4];
|
||||||
|
int row, col, x, y, x1, x2, y1, y2, t, weight, grads, color, diag;
|
||||||
|
@@ -4456,11 +4463,11 @@ void CLASS vng_interpolate()
|
||||||
|
for (row=0; row < prow; row++) /* Precalculate for VNG */
|
||||||
|
for (col=0; col < pcol; col++) {
|
||||||
|
code[row][col] = ip;
|
||||||
|
- for (cp=terms, t=0; t < 64; t++) {
|
||||||
|
- y1 = *cp++; x1 = *cp++;
|
||||||
|
- y2 = *cp++; x2 = *cp++;
|
||||||
|
- weight = *cp++;
|
||||||
|
- grads = *cp++;
|
||||||
|
+ for (cpt=&terms[0], t=0; t < 64, cpt = &terms[t]; t++) {
|
||||||
|
+ y1 = cpt->y1; x1 = cpt->x1;
|
||||||
|
+ y2 = cpt->y2; x2 = cpt->x2;
|
||||||
|
+ weight = cpt->weight;
|
||||||
|
+ grads = cpt->grads;
|
||||||
|
color = fcol(row+y1,col+x1);
|
||||||
|
if (fcol(row+y2,col+x2) != color) continue;
|
||||||
|
diag = (fcol(row,col+1) == color && fcol(row+1,col) == color) ? 2:1;
|
||||||
Loading…
Reference in New Issue
Block a user