diff options
| -rw-r--r-- | graphics/gimp-ufraw/distinfo | 5 | ||||
| -rw-r--r-- | graphics/gimp-ufraw/patches/patch-dcraw.cc | 24 | ||||
| -rw-r--r-- | graphics/gimp-ufraw/patches/patch-dcraw__api.cc | 22 | ||||
| -rw-r--r-- | graphics/gimp-ufraw/patches/patch-dcraw__indi.c | 31 |
4 files changed, 81 insertions, 1 deletions
diff --git a/graphics/gimp-ufraw/distinfo b/graphics/gimp-ufraw/distinfo index 3bbbf7c2670..e8b3672e1ec 100644 --- a/graphics/gimp-ufraw/distinfo +++ b/graphics/gimp-ufraw/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.35 2019/08/20 14:31:03 gdt Exp $ +$NetBSD: distinfo,v 1.36 2020/04/20 00:38:36 joerg Exp $ SHA1 (ufraw-0.22.tar.gz) = 7fc33b66f4d6ecc277e1a5589c8e5db24568949c RMD160 (ufraw-0.22.tar.gz) = 2588acde88dda8c30310b967e7185862072c124c SHA512 (ufraw-0.22.tar.gz) = a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2 Size (ufraw-0.22.tar.gz) = 1103554 bytes +SHA1 (patch-dcraw.cc) = d68c75bb0438df6bd16ecde2d2718b573018fa28 +SHA1 (patch-dcraw__api.cc) = 70cd527ddc226bcac16638e3a631acf42c72dbbf +SHA1 (patch-dcraw__indi.c) = c070b8a8fc7d47b3e3ed3817098c5f9bb2c1d62a SHA1 (patch-ufraw__exiv2.cc) = c6f3c6bd9ec8cdc3dee1801f9b1972bbe827cd8d diff --git a/graphics/gimp-ufraw/patches/patch-dcraw.cc b/graphics/gimp-ufraw/patches/patch-dcraw.cc new file mode 100644 index 00000000000..50f2017e120 --- /dev/null +++ b/graphics/gimp-ufraw/patches/patch-dcraw.cc @@ -0,0 +1,24 @@ +$NetBSD: patch-dcraw.cc,v 1.1 2020/04/20 00:38:36 joerg Exp $ + +--- dcraw.cc.orig 2020-04-19 19:55:05.713900482 +0000 ++++ dcraw.cc +@@ -9240,11 +9240,15 @@ canon_a5: + filters = 0x16161616; + } + if (make[0] == 'O') { +- i = find_green (12, 32, 1188864, 3576832); +- c = find_green (12, 32, 2383920, 2387016); +- if (abs(i) < abs(c)) { +- SWAP(i,c); ++ float i_ = find_green (12, 32, 1188864, 3576832); ++ float c_ = find_green (12, 32, 2383920, 2387016); ++ if (abs(i_) < abs(c_)) { ++ c = i_; ++ i = c_; + load_flags = 24; ++ } else { ++ i = i_; ++ c = c_; + } + if ((int) i < 0) filters = 0x61616161; + } diff --git a/graphics/gimp-ufraw/patches/patch-dcraw__api.cc b/graphics/gimp-ufraw/patches/patch-dcraw__api.cc new file mode 100644 index 00000000000..f8cb8859496 --- /dev/null +++ b/graphics/gimp-ufraw/patches/patch-dcraw__api.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-dcraw__api.cc,v 1.1 2020/04/20 00:38:36 joerg Exp $ + +--- dcraw_api.cc.orig 2020-04-19 19:59:33.951610818 +0000 ++++ dcraw_api.cc +@@ -687,7 +687,7 @@ extern "C" { + if (dark) { + #ifdef _OPENMP + #pragma omp parallel for schedule(static) default(none) \ +- shared(h,dark,rgbWB) ++ shared(h,dark,rgbWB,pixels,black) + #endif + for (int i = 0; i < pixels; i++) { + int cc; +@@ -700,7 +700,7 @@ extern "C" { + } else { + #ifdef _OPENMP + #pragma omp parallel for schedule(static) default(none) \ +- shared(h,dark,rgbWB) ++ shared(h,dark,rgbWB,pixels,black) + #endif + for (int i = 0; i < pixels; i++) { + int cc; diff --git a/graphics/gimp-ufraw/patches/patch-dcraw__indi.c b/graphics/gimp-ufraw/patches/patch-dcraw__indi.c new file mode 100644 index 00000000000..42f70252d12 --- /dev/null +++ b/graphics/gimp-ufraw/patches/patch-dcraw__indi.c @@ -0,0 +1,31 @@ +$NetBSD: patch-dcraw__indi.c,v 1.1 2020/04/20 00:38:36 joerg Exp $ + +--- dcraw_indi.c.orig 2020-04-19 19:58:30.067650344 +0000 ++++ dcraw_indi.c +@@ -143,7 +143,7 @@ void CLASS wavelet_denoise_INDI(ushort(* + #else + #pragma omp parallel for \ + default(none) \ +- shared(nc,image,size) \ ++ shared(nc,image,size,iwidth,iheight,threshold,noise) \ + private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp) + #endif + #endif +@@ -414,7 +414,7 @@ void CLASS vng_interpolate_INDI(ushort(* + #ifdef _OPENMP + #pragma omp parallel \ + default(none) \ +- shared(image,code,prow,pcol,h) \ ++ shared(image,code,prow,pcol,h,colors,width,filters,height) \ + private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t) + #endif + { +@@ -497,7 +497,7 @@ void CLASS ppg_interpolate_INDI(ushort(* + #ifdef _OPENMP + #pragma omp parallel \ + default(none) \ +- shared(image,dir,diff) \ ++ shared(image,dir,diff,height,width,filters) \ + private(row,col,i,d,c,pix,guess) + #endif + { |