Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31560
Modified Files:
dcraw_api.cc ufraw_ufraw.c
Log Message:
Simplify OpenMP use. Patch by Frank van Maarseveen.
Index: ufraw_ufraw.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_ufraw.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -d -r1.201 -r1.202
--- ufraw_ufraw.c 29 Oct 2009 03:30:08 -0000 1.201
+++ ufraw_ufraw.c 29 Oct 2009 05:14:59 -0000 1.202
@@ -929,7 +929,7 @@
delta = rgbMax / (uf->conf->hotpixel + 1.0);
count = 0;
#ifdef _OPENMP
-#pragma omp parallel for schedule(static,64) default(none) \
+#pragma omp parallel for schedule(static) default(none) \
shared(uf,img,width,height,colors,rgbMax,delta) \
reduction(+:count) \
private(h,p,w,c,t,v,hi,i)
@@ -1095,7 +1095,7 @@
mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i];
size = img->height * img->width;
#ifdef _OPENMP
-#pragma omp parallel for schedule(static,65536) default(none) \
+#pragma omp parallel for schedule(static) default(none) \
shared(uf,phase,img,mul,size) \
private(i,p16,c,px)
#endif
Index: dcraw_api.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/dcraw_api.cc,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- dcraw_api.cc 28 Oct 2009 04:44:05 -0000 1.59
+++ dcraw_api.cc 29 Oct 2009 05:14:59 -0000 1.60
@@ -440,7 +440,7 @@
f4 = hh->fourColorFilters;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static,64) private(r,ri,fseq,c,pixp)
+#pragma omp parallel for schedule(static) private(r,ri,fseq,c,pixp)
#endif
for (r = 0; r < h; ++r) {
for (ri = 0; ri < scale; ++ri)
@@ -458,7 +458,7 @@
f->image = (dcraw_image_type *)g_realloc(
f->image, h * w * sizeof(dcraw_image_type));
#ifdef _OPENMP
- #pragma omp parallel for schedule(static,64) private(r,ibase,obase,c)
+#pragma omp parallel for schedule(static) private(r,ibase,obase,c)
#endif
for (r = 0; r < h; ++r) {
ibase = hh->raw.image + r * hh->raw.width * scale;
@@ -636,7 +636,7 @@
}
} else {
#ifdef _OPENMP
-#pragma omp parallel for schedule(static,64) default(none) \
+#pragma omp parallel for schedule(static) default(none) \
shared(h,dark,rgbWB,pixels,f4,black) \
private(r,base,fseq,c,cc,px)
#endif
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
ufraw-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
