Changeset 532 for ImageMagick/trunk
- Timestamp:
- 11/03/09 19:03:49 (3 weeks ago)
- Location:
- ImageMagick/trunk
- Files:
-
- 28 modified
-
coders/dpx.c (modified) (1 diff)
-
coders/pnm.c (modified) (5 diffs)
-
magick/attribute.c (modified) (7 diffs)
-
magick/colormap.c (modified) (3 diffs)
-
magick/colorspace.c (modified) (39 diffs)
-
magick/compare.c (modified) (14 diffs)
-
magick/composite.c (modified) (8 diffs)
-
magick/decorate.c (modified) (6 diffs)
-
magick/deprecate.c (modified) (2 diffs)
-
magick/distort.c (modified) (4 diffs)
-
magick/draw.c (modified) (4 diffs)
-
magick/effect.c (modified) (26 diffs)
-
magick/enhance.c (modified) (42 diffs)
-
magick/fourier.c (modified) (4 diffs)
-
magick/fx.c (modified) (30 diffs)
-
magick/image.c (modified) (9 diffs)
-
magick/paint.c (modified) (8 diffs)
-
magick/prepress.c (modified) (2 diffs)
-
magick/profile.c (modified) (2 diffs)
-
magick/quantize.c (modified) (3 diffs)
-
magick/resize.c (modified) (6 diffs)
-
magick/segment.c (modified) (3 diffs)
-
magick/shear.c (modified) (12 diffs)
-
magick/statistic.c (modified) (2 diffs)
-
magick/threshold.c (modified) (16 diffs)
-
magick/transform.c (modified) (17 diffs)
-
wand/mogrify.c (modified) (2 diffs)
-
wand/pixel-view.c (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ImageMagick/trunk/coders/dpx.c
r404 r532 1156 1156 image_view=AcquireCacheView(image); 1157 1157 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) 1158 #pragma omp parallel for s hared(row,status,quantum_type)1158 #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) 1159 1159 #endif 1160 1160 for (y=0; y < (long) image->rows; y++) -
ImageMagick/trunk/coders/pnm.c
r404 r532 595 595 image_view=AcquireCacheView(image); 596 596 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) 597 #pragma omp parallel for s hared(row,status,quantum_type)597 #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) 598 598 #endif 599 599 for (y=0; y < (long) image->rows; y++) … … 677 677 image_view=AcquireCacheView(image); 678 678 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) 679 #pragma omp parallel for s hared(row,status,quantum_type)679 #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) 680 680 #endif 681 681 for (y=0; y < (long) image->rows; y++) … … 795 795 image_view=AcquireCacheView(image); 796 796 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) 797 #pragma omp parallel for s hared(row,status,type)797 #pragma omp parallel for schedule(static,1) shared(row,status,type) 798 798 #endif 799 799 for (y=0; y < (long) image->rows; y++) … … 969 969 image_view=AcquireCacheView(image); 970 970 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) 971 #pragma omp parallel for s hared(row,status,quantum_type)971 #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) 972 972 #endif 973 973 for (y=0; y < (long) image->rows; y++) … … 1212 1212 image_view=AcquireCacheView(image); 1213 1213 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) 1214 #pragma omp parallel for s hared(row,status,quantum_type)1214 #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) 1215 1215 #endif 1216 1216 for (y=0; y < (long) image->rows; y++) -
ImageMagick/trunk/magick/attribute.c
r504 r532 169 169 status=MagickTrue; 170 170 GetMagickPixelPacket(image,&zero); 171 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)172 #pragma omp parallel for s hared(status)171 #if defined(MAGICKCORE_OPENMP_SUPPORT) 172 #pragma omp parallel for schedule(dynamic,4) shared(status) 173 173 #endif 174 174 for (y=0; y < (long) image->rows; y++) … … 191 191 if (status == MagickFalse) 192 192 continue; 193 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)193 #if defined(MAGICKCORE_OPENMP_SUPPORT) 194 194 # pragma omp critical (MagickCore_GetImageBoundingBox) 195 195 #endif … … 220 220 p++; 221 221 } 222 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)222 #if defined(MAGICKCORE_OPENMP_SUPPORT) 223 223 # pragma omp critical (MagickCore_GetImageBoundingBox) 224 224 #endif … … 325 325 326 326 p=image->colormap; 327 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)328 #pragma omp parallel for s hared(status)327 #if defined(MAGICKCORE_OPENMP_SUPPORT) 328 #pragma omp parallel for schedule(dynamic,4) shared(status) 329 329 #endif 330 330 for (i=0; i < (long) image->colors; i++) … … 366 366 } 367 367 image_view=AcquireCacheView(image); 368 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)369 #pragma omp parallel for s hared(status)368 #if defined(MAGICKCORE_OPENMP_SUPPORT) 369 #pragma omp parallel for schedule(dynamic,4) shared(status) 370 370 #endif 371 371 for (y=0; y < (long) image->rows; y++) … … 911 911 exception=(&image->exception); 912 912 image_view=AcquireCacheView(image); 913 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)914 #pragma omp parallel for s hared(status)913 #if defined(MAGICKCORE_OPENMP_SUPPORT) 914 #pragma omp parallel for schedule(dynamic,4) shared(status) 915 915 #endif 916 916 for (y=0; y < (long) image->rows; y++) … … 970 970 p=image->colormap; 971 971 range=GetQuantumRange(depth); 972 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)973 #pragma omp parallel for s hared(status)972 #if defined(MAGICKCORE_OPENMP_SUPPORT) 973 #pragma omp parallel for schedule(dynamic,4) shared(status) 974 974 #endif 975 975 for (i=0; i < (long) image->colors; i++) -
ImageMagick/trunk/magick/colormap.c
r404 r532 119 119 exception=(&image->exception); 120 120 image_view=AcquireCacheView(image); 121 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)122 #pragma omp parallel for s hared(status)121 #if defined(MAGICKCORE_OPENMP_SUPPORT) 122 #pragma omp parallel for schedule(dynamic,4) shared(status) 123 123 #endif 124 124 for (y=0; y < (long) image->rows; y++) … … 248 248 Assign index values to colormap entries. 249 249 */ 250 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)251 #pragma omp parallel for s hared(status)250 #if defined(MAGICKCORE_OPENMP_SUPPORT) 251 #pragma omp parallel for schedule(dynamic,4) shared(status) 252 252 #endif 253 253 for (i=0; i < (long) image->colors; i++) … … 261 261 Update image colormap indexes to sorted colormap order. 262 262 */ 263 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)264 #pragma omp parallel for s hared(status)263 #if defined(MAGICKCORE_OPENMP_SUPPORT) 264 #pragma omp parallel for schedule(dynamic,4) shared(status) 265 265 #endif 266 266 for (i=0; i < (long) image->colors; i++) -
ImageMagick/trunk/magick/colorspace.c
r404 r532 224 224 } 225 225 image_view=AcquireCacheView(image); 226 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)227 #pragma omp parallel for s hared(status)226 #if defined(MAGICKCORE_OPENMP_SUPPORT) 227 #pragma omp parallel for schedule(dynamic,4) shared(status) 228 228 #endif 229 229 for (y=0; y < (long) image->rows; y++) … … 277 277 GetMagickPixelPacket(image,&zero); 278 278 image_view=AcquireCacheView(image); 279 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)280 #pragma omp parallel for s hared(status)279 #if defined(MAGICKCORE_OPENMP_SUPPORT) 280 #pragma omp parallel for schedule(dynamic,4) shared(status) 281 281 #endif 282 282 for (y=0; y < (long) image->rows; y++) … … 334 334 } 335 335 image_view=AcquireCacheView(image); 336 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)337 #pragma omp parallel for s hared(status)336 #if defined(MAGICKCORE_OPENMP_SUPPORT) 337 #pragma omp parallel for schedule(dynamic,4) shared(status) 338 338 #endif 339 339 for (y=0; y < (long) image->rows; y++) … … 390 390 } 391 391 image_view=AcquireCacheView(image); 392 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)393 #pragma omp parallel for s hared(status)392 #if defined(MAGICKCORE_OPENMP_SUPPORT) 393 #pragma omp parallel for schedule(dynamic,4) shared(status) 394 394 #endif 395 395 for (y=0; y < (long) image->rows; y++) … … 446 446 } 447 447 image_view=AcquireCacheView(image); 448 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)449 #pragma omp parallel for s hared(status)448 #if defined(MAGICKCORE_OPENMP_SUPPORT) 449 #pragma omp parallel for schedule(dynamic,4) shared(status) 450 450 #endif 451 451 for (y=0; y < (long) image->rows; y++) … … 502 502 } 503 503 image_view=AcquireCacheView(image); 504 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)505 #pragma omp parallel for s hared(status)504 #if defined(MAGICKCORE_OPENMP_SUPPORT) 505 #pragma omp parallel for schedule(dynamic,4) shared(status) 506 506 #endif 507 507 for (y=0; y < (long) image->rows; y++) … … 594 594 black=pow(10.0,(reference_black-reference_white)*(gamma/density)* 595 595 0.002/0.6); 596 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)597 #pragma omp parallel for 596 #if defined(MAGICKCORE_OPENMP_SUPPORT) 597 #pragma omp parallel for schedule(dynamic,4) 598 598 #endif 599 599 for (i=0; i <= (long) MaxMap; i++) … … 602 602 0.002/0.6))/1024.0+0.5)); 603 603 image_view=AcquireCacheView(image); 604 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)605 #pragma omp parallel for s hared(status)604 #if defined(MAGICKCORE_OPENMP_SUPPORT) 605 #pragma omp parallel for schedule(dynamic,4) shared(status) 606 606 #endif 607 607 for (y=0; y < (long) image->rows; y++) … … 671 671 primary_info.y=(double) (MaxMap+1.0)/2.0; 672 672 primary_info.z=(double) (MaxMap+1.0)/2.0; 673 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)674 #pragma omp parallel for 673 #if defined(MAGICKCORE_OPENMP_SUPPORT) 674 #pragma omp parallel for schedule(dynamic,4) 675 675 #endif 676 676 for (i=0; i <= (long) MaxMap; i++) … … 696 696 G = 0.29900*R+0.58700*G+0.11400*B 697 697 */ 698 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)699 #pragma omp parallel for 698 #if defined(MAGICKCORE_OPENMP_SUPPORT) 699 #pragma omp parallel for schedule(dynamic,4) 700 700 #endif 701 701 for (i=0; i <= (long) MaxMap; i++) … … 729 729 primary_info.y=(double) (MaxMap+1.0)/2.0; 730 730 primary_info.z=(double) (MaxMap+1.0)/2.0; 731 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)732 #pragma omp parallel for 731 #if defined(MAGICKCORE_OPENMP_SUPPORT) 732 #pragma omp parallel for schedule(dynamic,4) 733 733 #endif 734 734 for (i=0; i <= (long) MaxMap; i++) … … 753 753 G = 0.21260*R+0.71520*G+0.07220*B 754 754 */ 755 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)756 #pragma omp parallel for 755 #if defined(MAGICKCORE_OPENMP_SUPPORT) 756 #pragma omp parallel for schedule(dynamic,4) 757 757 #endif 758 758 for (i=0; i <= (long) MaxMap; i++) … … 784 784 primary_info.y=(double) (MaxMap+1.0)/2.0; 785 785 primary_info.z=(double) (MaxMap+1.0)/2.0; 786 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)787 #pragma omp parallel for 786 #if defined(MAGICKCORE_OPENMP_SUPPORT) 787 #pragma omp parallel for schedule(dynamic,4) 788 788 #endif 789 789 for (i=0; i <= (long) MaxMap; i++) … … 810 810 B = 0.0*R+0.0*G+1.0*B 811 811 */ 812 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)813 #pragma omp parallel for 812 #if defined(MAGICKCORE_OPENMP_SUPPORT) 813 #pragma omp parallel for schedule(dynamic,4) 814 814 #endif 815 815 for (i=0; i <= (long) MaxMap; i++) … … 844 844 Z = 0.0193339*R+0.1191920*G+0.9503041*B 845 845 */ 846 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)847 #pragma omp parallel for 846 #if defined(MAGICKCORE_OPENMP_SUPPORT) 847 #pragma omp parallel for schedule(dynamic,4) 848 848 #endif 849 849 for (i=0; i <= (long) MaxMap; i++) … … 914 914 primary_info.y=(double) (MaxMap+1.0)/2.0; 915 915 primary_info.z=(double) (MaxMap+1.0)/2.0; 916 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)917 #pragma omp parallel for 916 #if defined(MAGICKCORE_OPENMP_SUPPORT) 917 #pragma omp parallel for schedule(dynamic,4) 918 918 #endif 919 919 for (i=0; i <= (long) MaxMap; i++) … … 945 945 primary_info.y=(double) (MaxMap+1.0)/2.0; 946 946 primary_info.z=(double) (MaxMap+1.0)/2.0; 947 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)948 #pragma omp parallel for 947 #if defined(MAGICKCORE_OPENMP_SUPPORT) 948 #pragma omp parallel for schedule(dynamic,4) 949 949 #endif 950 950 for (i=0; i <= (long) MaxMap; i++) … … 977 977 primary_info.y=(double) (MaxMap+1.0)/2.0; 978 978 primary_info.z=(double) (MaxMap+1.0)/2.0; 979 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)980 #pragma omp parallel for 979 #if defined(MAGICKCORE_OPENMP_SUPPORT) 980 #pragma omp parallel for schedule(dynamic,4) 981 981 #endif 982 982 for (i=0; i <= (long) MaxMap; i++) … … 1007 1007 */ 1008 1008 image_view=AcquireCacheView(image); 1009 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1010 #pragma omp parallel for s hared(status)1009 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1010 #pragma omp parallel for schedule(dynamic,4) shared(status) 1011 1011 #endif 1012 1012 for (y=0; y < (long) image->rows; y++) … … 1059 1059 proceed; 1060 1060 1061 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1061 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1062 1062 #pragma omp critical (MagickCore_RGBTransformImage) 1063 1063 #endif … … 1420 1420 } 1421 1421 image_view=AcquireCacheView(image); 1422 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1423 #pragma omp parallel for s hared(status)1422 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1423 #pragma omp parallel for schedule(dynamic,4) shared(status) 1424 1424 #endif 1425 1425 for (y=0; y < (long) image->rows; y++) … … 1476 1476 GetMagickPixelPacket(image,&zero); 1477 1477 image_view=AcquireCacheView(image); 1478 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1479 #pragma omp parallel for s hared(status)1478 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1479 #pragma omp parallel for schedule(dynamic,4) shared(status) 1480 1480 #endif 1481 1481 for (y=0; y < (long) image->rows; y++) … … 1536 1536 } 1537 1537 image_view=AcquireCacheView(image); 1538 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1539 #pragma omp parallel for s hared(status)1538 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1539 #pragma omp parallel for schedule(dynamic,4) shared(status) 1540 1540 #endif 1541 1541 for (y=0; y < (long) image->rows; y++) … … 1594 1594 } 1595 1595 image_view=AcquireCacheView(image); 1596 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1597 #pragma omp parallel for s hared(status)1596 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1597 #pragma omp parallel for schedule(dynamic,4) shared(status) 1598 1598 #endif 1599 1599 for (y=0; y < (long) image->rows; y++) … … 1652 1652 } 1653 1653 image_view=AcquireCacheView(image); 1654 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1655 #pragma omp parallel for s hared(status)1654 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1655 #pragma omp parallel for schedule(dynamic,4) shared(status) 1656 1656 #endif 1657 1657 for (y=0; y < (long) image->rows; y++) … … 1710 1710 } 1711 1711 image_view=AcquireCacheView(image); 1712 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1713 #pragma omp parallel for s hared(status)1712 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1713 #pragma omp parallel for schedule(dynamic,4) shared(status) 1714 1714 #endif 1715 1715 for (y=0; y < (long) image->rows; y++) … … 1811 1811 return(MagickFalse); 1812 1812 image_view=AcquireCacheView(image); 1813 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1814 #pragma omp parallel for s hared(status)1813 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1814 #pragma omp parallel for schedule(dynamic,4) shared(status) 1815 1815 #endif 1816 1816 for (y=0; y < (long) image->rows; y++) … … 1890 1890 through QuantumRange. 1891 1891 */ 1892 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1893 #pragma omp parallel for 1892 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1893 #pragma omp parallel for schedule(dynamic,4) 1894 1894 #endif 1895 1895 for (i=0; i <= (long) MaxMap; i++) … … 1925 1925 through QuantumRange. 1926 1926 */ 1927 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1928 #pragma omp parallel for 1927 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1928 #pragma omp parallel for schedule(dynamic,4) 1929 1929 #endif 1930 1930 for (i=0; i <= (long) MaxMap; i++) … … 1958 1958 through QuantumRange. 1959 1959 */ 1960 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1961 #pragma omp parallel for 1960 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1961 #pragma omp parallel for schedule(dynamic,4) 1962 1962 #endif 1963 1963 for (i=0; i <= (long) MaxMap; i++) … … 1988 1988 B = 0.0*R+0.0*G+1.0*B 1989 1989 */ 1990 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1991 #pragma omp parallel for 1990 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1991 #pragma omp parallel for schedule(dynamic,4) 1992 1992 #endif 1993 1993 for (i=0; i <= (long) MaxMap; i++) … … 2014 2014 B = 0.0556434*X-0.2040259*Y+1.057225*Z 2015 2015 */ 2016 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2017 #pragma omp parallel for 2016 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2017 #pragma omp parallel for schedule(dynamic,4) 2018 2018 #endif 2019 2019 for (i=0; i <= (long) MaxMap; i++) … … 2042 2042 YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137. 2043 2043 */ 2044 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2045 #pragma omp parallel for 2044 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2045 #pragma omp parallel for schedule(dynamic,4) 2046 2046 #endif 2047 2047 for (i=0; i <= (long) MaxMap; i++) … … 2075 2075 through QuantumRange. 2076 2076 */ 2077 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2078 #pragma omp parallel for 2077 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2078 #pragma omp parallel for schedule(dynamic,4) 2079 2079 #endif 2080 2080 for (i=0; i <= (long) MaxMap; i++) … … 2110 2110 through QuantumRange. 2111 2111 */ 2112 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2113 #pragma omp parallel for 2112 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2113 #pragma omp parallel for schedule(dynamic,4) 2114 2114 #endif 2115 2115 for (i=0; i <= (long) MaxMap; i++) … … 2144 2144 through QuantumRange. 2145 2145 */ 2146 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2147 #pragma omp parallel for 2146 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2147 #pragma omp parallel for schedule(dynamic,4) 2148 2148 #endif 2149 2149 for (i=0; i <= (long) MaxMap; i++) … … 2178 2178 */ 2179 2179 image_view=AcquireCacheView(image); 2180 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2181 #pragma omp parallel for s hared(status)2180 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2181 #pragma omp parallel for schedule(dynamic,4) shared(status) 2182 2182 #endif 2183 2183 for (y=0; y < (long) image->rows; y++) … … 2269 2269 proceed; 2270 2270 2271 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2271 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2272 2272 #pragma omp critical (MagickCore_TransformRGBImage) 2273 2273 #endif … … 2287 2287 */ 2288 2288 image_view=AcquireCacheView(image); 2289 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2290 #pragma omp parallel for s hared(status)2289 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2290 #pragma omp parallel for schedule(dynamic,4) shared(status) 2291 2291 #endif 2292 2292 for (i=0; i < (long) image->colors; i++) -
ImageMagick/trunk/magick/compare.c
r404 r532 198 198 reconstruct_view=AcquireCacheView(reconstruct_image); 199 199 highlight_view=AcquireCacheView(highlight_image); 200 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)201 #pragma omp parallel for s hared(status)200 #if defined(MAGICKCORE_OPENMP_SUPPORT) 201 #pragma omp parallel for schedule(dynamic,4) shared(status) 202 202 #endif 203 203 for (y=0; y < (long) image->rows; y++) … … 370 370 image_view=AcquireCacheView(image); 371 371 reconstruct_view=AcquireCacheView(reconstruct_image); 372 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)373 #pragma omp parallel for s hared(status)372 #if defined(MAGICKCORE_OPENMP_SUPPORT) 373 #pragma omp parallel for schedule(dynamic,4) shared(status) 374 374 #endif 375 375 for (y=0; y < (long) image->rows; y++) … … 433 433 q++; 434 434 } 435 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)435 #if defined(MAGICKCORE_OPENMP_SUPPORT) 436 436 #pragma omp critical (MagickCore_GetAbsoluteError) 437 437 #endif … … 486 486 image_view=AcquireCacheView(image); 487 487 reconstruct_view=AcquireCacheView(reconstruct_image); 488 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)489 #pragma omp parallel for s hared(status)488 #if defined(MAGICKCORE_OPENMP_SUPPORT) 489 #pragma omp parallel for schedule(dynamic,4) shared(status) 490 490 #endif 491 491 for (y=0; y < (long) image->rows; y++) … … 560 560 q++; 561 561 } 562 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)562 #if defined(MAGICKCORE_OPENMP_SUPPORT) 563 563 #pragma omp critical (MagickCore_GetMeanAbsoluteError) 564 564 #endif … … 723 723 image_view=AcquireCacheView(image); 724 724 reconstruct_view=AcquireCacheView(reconstruct_image); 725 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)726 #pragma omp parallel for s hared(status)725 #if defined(MAGICKCORE_OPENMP_SUPPORT) 726 #pragma omp parallel for schedule(dynamic,4) shared(status) 727 727 #endif 728 728 for (y=0; y < (long) image->rows; y++) … … 798 798 q++; 799 799 } 800 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)800 #if defined(MAGICKCORE_OPENMP_SUPPORT) 801 801 #pragma omp critical (MagickCore_GetMeanSquaredError) 802 802 #endif … … 829 829 image_view=AcquireCacheView(image); 830 830 reconstruct_view=AcquireCacheView(reconstruct_image); 831 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)832 #pragma omp parallel for s hared(status)831 #if defined(MAGICKCORE_OPENMP_SUPPORT) 832 #pragma omp parallel for schedule(dynamic,4) shared(status) 833 833 #endif 834 834 for (y=0; y < (long) image->rows; y++) … … 914 914 q++; 915 915 } 916 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)916 #if defined(MAGICKCORE_OPENMP_SUPPORT) 917 917 #pragma omp critical (MagickCore_GetPeakAbsoluteError) 918 918 #endif … … 1405 1405 image_view=AcquireCacheView(image); 1406 1406 reference_view=AcquireCacheView(reference); 1407 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1408 #pragma omp parallel for s hared(status)1407 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1408 #pragma omp parallel for schedule(dynamic,4) shared(status) 1409 1409 #endif 1410 1410 for (y=0; y < (long) reference->rows; y++) … … 1461 1461 thread_similarity+=distance*distance; 1462 1462 } 1463 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1463 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1464 1464 #pragma omp critical (MagickCore_GetSimilarityMetric) 1465 1465 #endif … … 1524 1524 progress=0; 1525 1525 similarity_view=AcquireCacheView(similarity_image); 1526 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1527 #pragma omp parallel for s hared(progress,status)1526 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1527 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1528 1528 #endif 1529 1529 for (y=0; y < (long) (image->rows-reference->rows+1); y++) … … 1550 1550 { 1551 1551 similarity=GetSimilarityMetric(image,reference,x,y,exception); 1552 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1552 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1553 1553 #pragma omp critical (MagickCore_SimilarityImage) 1554 1554 #endif … … 1571 1571 proceed; 1572 1572 1573 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1573 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1574 1574 #pragma omp critical (MagickCore_SimilarityImage) 1575 1575 #endif -
ImageMagick/trunk/magick/composite.c
r404 r532 1369 1369 image_view=AcquireCacheView(image); 1370 1370 composite_view=AcquireCacheView(composite_image); 1371 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1372 #pragma omp parallel for s hared(status)1371 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1372 #pragma omp parallel for schedule(dynamic,4) shared(status) 1373 1373 #endif 1374 1374 for (y=0; y < (long) composite_image->rows; y++) … … 1415 1415 proceed; 1416 1416 1417 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1417 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1418 1418 #pragma omp critical (MagickCore_TextureImage) 1419 1419 #endif … … 1845 1845 image_view=AcquireCacheView(image); 1846 1846 composite_view=AcquireCacheView(composite_image); 1847 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1848 #pragma omp parallel for s hared(progress,status)1847 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1848 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1849 1849 #endif 1850 1850 for (y=0; y < (long) image->rows; y++) … … 2432 2432 proceed; 2433 2433 2434 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2434 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2435 2435 #pragma omp critical (MagickCore_CompositeImageChannel) 2436 2436 #endif … … 2506 2506 Tile texture onto the image background. 2507 2507 */ 2508 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2509 #pragma omp parallel for s hared(status)2508 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2509 #pragma omp parallel for schedule(dynamic,4) shared(status) 2510 2510 #endif 2511 2511 for (y=0; y < (long) image->rows; y+=texture->rows) … … 2534 2534 proceed; 2535 2535 2536 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2536 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2537 2537 #pragma omp critical (MagickCore_TextureImage) 2538 2538 #endif … … 2553 2553 image_view=AcquireCacheView(image); 2554 2554 texture_view=AcquireCacheView(texture); 2555 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2556 #pragma omp parallel for s hared(status)2555 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2556 #pragma omp parallel for schedule(dynamic,4) shared(status) 2557 2557 #endif 2558 2558 for (y=0; y < (long) image->rows; y++) … … 2615 2615 proceed; 2616 2616 2617 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2617 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2618 2618 #pragma omp critical (MagickCore_TextureImage) 2619 2619 #endif -
ImageMagick/trunk/magick/decorate.c
r404 r532 400 400 Draw sides of ornamental border. 401 401 */ 402 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)403 #pragma omp parallel for s hared(progress,status)402 #if defined(MAGICKCORE_OPENMP_SUPPORT) 403 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 404 404 #endif 405 405 for (y=0; y < (long) image->rows; y++) … … 507 507 proceed; 508 508 509 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)509 #if defined(MAGICKCORE_OPENMP_SUPPORT) 510 510 #pragma omp critical (MagickCore_FrameImage) 511 511 #endif … … 722 722 exception=(&image->exception); 723 723 image_view=AcquireCacheView(image); 724 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)725 #pragma omp parallel for s hared(progress,status)724 #if defined(MAGICKCORE_OPENMP_SUPPORT) 725 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 726 726 #endif 727 727 for (y=0; y < (long) raise_info->height; y++) … … 789 789 } 790 790 } 791 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)792 #pragma omp parallel for s hared(progress,status)791 #if defined(MAGICKCORE_OPENMP_SUPPORT) 792 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 793 793 #endif 794 794 for (y=(long) raise_info->height; y < (long) (image->rows-raise_info->height); y++) … … 845 845 } 846 846 } 847 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)848 #pragma omp parallel for s hared(progress,status)847 #if defined(MAGICKCORE_OPENMP_SUPPORT) 848 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 849 849 #endif 850 850 for (y=(long) (image->rows-raise_info->height); y < (long) image->rows; y++) … … 904 904 proceed; 905 905 906 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)906 #if defined(MAGICKCORE_OPENMP_SUPPORT) 907 907 #pragma omp critical (MagickCore_RaiseImage) 908 908 #endif -
ImageMagick/trunk/magick/deprecate.c
r460 r532 1709 1709 similarity_threshold=image->columns*image->rows; 1710 1710 SetGeometry(reference,&offset); 1711 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1712 #pragma omp parallel for 1711 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1712 #pragma omp parallel for schedule(dynamic,4) 1713 1713 #endif 1714 1714 for (y=0; y < (long) (image->rows-reference->rows); y++) … … 1724 1724 similarity=GetSimilarityMetric(image,reference,x,y,similarity_threshold, 1725 1725 exception); 1726 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1726 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1727 1727 #pragma omp critical (MagickCore_ExtractSubimageFromImage) 1728 1728 #endif -
ImageMagick/trunk/magick/distort.c
r404 r532 1925 1925 resample_filter=AcquireResampleFilterThreadSet(image,MagickFalse,exception); 1926 1926 distort_view=AcquireCacheView(distort_image); 1927 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1928 #pragma omp parallel for s hared(progress,status)1927 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1928 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1929 1929 #endif 1930 1930 for (j=0; j < (long) distort_image->rows; j++) … … 2284 2284 proceed; 2285 2285 2286 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2286 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2287 2287 #pragma omp critical (MagickCore_DistortImage) 2288 2288 #endif … … 2491 2491 GetMagickPixelPacket(sparse_image,&zero); 2492 2492 sparse_view=AcquireCacheView(sparse_image); 2493 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2494 #pragma omp parallel for s hared(progress,status)2493 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2494 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2495 2495 #endif 2496 2496 for (j=0; j < (long) sparse_image->rows; j++) … … 2650 2650 proceed; 2651 2651 2652 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2652 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2653 2653 #pragma omp critical (MagickCore_SparseColorImage) 2654 2654 #endif -
ImageMagick/trunk/magick/draw.c
r404 r532 1169 1169 image_view=AcquireCacheView(image); 1170 1170 source_view=AcquireCacheView(source); 1171 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1172 #pragma omp parallel for s hared(status)1171 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1172 #pragma omp parallel for schedule(dynamic,4) shared(status) 1173 1173 #endif 1174 1174 for (y=(long) (edge.y1+0.5); y <= (long) (edge.y2+0.5); y++) … … 3273 3273 GetMagickPixelPacket(image,&zero); 3274 3274 image_view=AcquireCacheView(image); 3275 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3276 #pragma omp parallel for s hared(status)3275 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3276 #pragma omp parallel for schedule(dynamic,4) shared(status) 3277 3277 #endif 3278 3278 for (y=bounding_box.y; y < (long) bounding_box.height; y++) … … 3881 3881 Draw point. 3882 3882 */ 3883 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3884 #pragma omp parallel for s hared(status)3883 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3884 #pragma omp parallel for schedule(dynamic,4) shared(status) 3885 3885 #endif 3886 3886 for (y=(long) (bounds.y1+0.5); y <= (long) (bounds.y2+0.5); y++) … … 3928 3928 if (image->matte == MagickFalse) 3929 3929 (void) SetImageAlphaChannel(image,OpaqueAlphaChannel); 3930 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3931 #pragma omp parallel for s hared(status)3930 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3931 #pragma omp parallel for schedule(dynamic,4) shared(status) 3932 3932 #endif 3933 3933 for (y=(long) (bounds.y1+0.5); y <= (long) (bounds.y2+0.5); y++) -
ImageMagick/trunk/magick/effect.c
r531 r532 268 268 edge_view=AcquireCacheView(edge_image); 269 269 blur_view=AcquireCacheView(blur_image); 270 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)271 #pragma omp parallel for s hared(progress,status)270 #if defined(MAGICKCORE_OPENMP_SUPPORT) 271 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 272 272 #endif 273 273 for (y=0; y < (long) blur_image->rows; y++) … … 379 379 proceed; 380 380 381 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)381 #if defined(MAGICKCORE_OPENMP_SUPPORT) 382 382 #pragma omp critical (MagickCore_AdaptiveBlurImageChannel) 383 383 #endif … … 585 585 edge_view=AcquireCacheView(edge_image); 586 586 sharp_view=AcquireCacheView(sharp_image); 587 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)588 #pragma omp parallel for s hared(progress,status)587 #if defined(MAGICKCORE_OPENMP_SUPPORT) 588 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 589 589 #endif 590 590 for (y=0; y < (long) sharp_image->rows; y++) … … 696 696 proceed; 697 697 698 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)698 #if defined(MAGICKCORE_OPENMP_SUPPORT) 699 699 #pragma omp critical (MagickCore_AdaptiveSharpenImageChannel) 700 700 #endif … … 903 903 image_view=AcquireCacheView(image); 904 904 blur_view=AcquireCacheView(blur_image); 905 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)906 #pragma omp parallel for s hared(progress,status)905 #if defined(MAGICKCORE_OPENMP_SUPPORT) 906 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 907 907 #endif 908 908 for (y=0; y < (long) blur_image->rows; y++) … … 1066 1066 proceed; 1067 1067 1068 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1068 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1069 1069 #pragma omp critical (MagickCore_BlurImageChannel) 1070 1070 #endif … … 1082 1082 image_view=AcquireCacheView(blur_image); 1083 1083 blur_view=AcquireCacheView(blur_image); 1084 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1085 #pragma omp parallel for s hared(progress,status)1084 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1085 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1086 1086 #endif 1087 1087 for (x=0; x < (long) blur_image->columns; x++) … … 1244 1244 proceed; 1245 1245 1246 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1246 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1247 1247 #pragma omp critical (MagickCore_BlurImageChannel) 1248 1248 #endif … … 1494 1494 image_view=AcquireCacheView(image); 1495 1495 despeckle_view=AcquireCacheView(despeckle_image); 1496 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1497 #pragma omp parallel for s hared(status)1496 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1497 #pragma omp parallel for schedule(dynamic,4) shared(status) 1498 1498 #endif 1499 1499 for (channel=0; channel <= 3; channel++) … … 1591 1591 proceed; 1592 1592 1593 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1593 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1594 1594 #pragma omp critical (MagickCore_DespeckleImage) 1595 1595 #endif … … 2239 2239 image_view=AcquireCacheView(image); 2240 2240 median_view=AcquireCacheView(median_image); 2241 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2242 #pragma omp parallel for s hared(progress,status)2241 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2242 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2243 2243 #endif 2244 2244 for (y=0; y < (long) median_image->rows; y++) … … 2311 2311 proceed; 2312 2312 2313 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2313 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2314 2314 #pragma omp critical (MagickCore_MedianFilterImage) 2315 2315 #endif … … 2511 2511 image_view=AcquireCacheView(image); 2512 2512 blur_view=AcquireCacheView(blur_image); 2513 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2514 #pragma omp parallel for s hared(progress,status)2513 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2514 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2515 2515 #endif 2516 2516 for (y=0; y < (long) image->rows; y++) … … 2630 2630 proceed; 2631 2631 2632 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2632 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2633 2633 #pragma omp critical (MagickCore_MotionBlurImageChannel) 2634 2634 #endif … … 3286 3286 image_view=AcquireCacheView(image); 3287 3287 blur_view=AcquireCacheView(blur_image); 3288 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3289 #pragma omp parallel for s hared(progress,status)3288 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3289 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3290 3290 #endif 3291 3291 for (y=0; y < (long) blur_image->rows; y++) … … 3434 3434 proceed; 3435 3435 3436 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3436 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3437 3437 #pragma omp critical (MagickCore_RadialBlurImageChannel) 3438 3438 #endif … … 3597 3597 image_view=AcquireCacheView(image); 3598 3598 noise_view=AcquireCacheView(noise_image); 3599 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3600 #pragma omp parallel for s hared(progress,status)3599 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3600 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3601 3601 #endif 3602 3602 for (y=0; y < (long) noise_image->rows; y++) … … 3669 3669 proceed; 3670 3670 3671 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3671 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3672 3672 #pragma omp critical (MagickCore_ReduceNoiseImage) 3673 3673 #endif … … 3851 3851 image_view=AcquireCacheView(image); 3852 3852 blur_view=AcquireCacheView(blur_image); 3853 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3854 #pragma omp parallel for s hared(progress,status)3853 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3854 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3855 3855 #endif 3856 3856 for (y=0; y < (long) image->rows; y++) … … 4082 4082 proceed; 4083 4083 4084 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4084 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4085 4085 #pragma omp critical (MagickCore_SelectiveBlurImageChannel) 4086 4086 #endif … … 4187 4187 image_view=AcquireCacheView(image); 4188 4188 shade_view=AcquireCacheView(shade_image); 4189 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4190 #pragma omp parallel for s hared(progress,status)4189 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4190 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 4191 4191 #endif 4192 4192 for (y=0; y < (long) image->rows; y++) … … 4279 4279 proceed; 4280 4280 4281 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4281 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4282 4282 #pragma omp critical (MagickCore_ShadeImage) 4283 4283 #endif … … 4484 4484 random_info=AcquireRandomInfoThreadSet(); 4485 4485 image_view=AcquireCacheView(spread_image); 4486 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4487 #pragma omp parallel for s hared(progress,status)4486 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4487 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 4488 4488 #endif 4489 4489 for (y=0; y < (long) spread_image->rows; y++) … … 4529 4529 proceed; 4530 4530 4531 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4531 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4532 4532 #pragma omp critical (MagickCore_SpreadImage) 4533 4533 #endif … … 4643 4643 image_view=AcquireCacheView(image); 4644 4644 unsharp_view=AcquireCacheView(unsharp_image); 4645 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4646 #pragma omp parallel for s hared(progress,status)4645 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4646 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 4647 4647 #endif 4648 4648 for (y=0; y < (long) image->rows; y++) … … 4738 4738 proceed; 4739 4739 4740 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4740 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4741 4741 #pragma omp critical (MagickCore_UnsharpMaskImageChannel) 4742 4742 #endif -
ImageMagick/trunk/magick/enhance.c
r404 r532 460 460 ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", 461 461 image->filename); 462 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)463 #pragma omp parallel for 462 #if defined(MAGICKCORE_OPENMP_SUPPORT) 463 #pragma omp parallel for schedule(dynamic,4) 464 464 #endif 465 465 for (i=0; i <= (long) MaxMap; i++) … … 480 480 Apply transfer function to colormap. 481 481 */ 482 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)483 #pragma omp parallel for s hared(progress,status)482 #if defined(MAGICKCORE_OPENMP_SUPPORT) 483 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 484 484 #endif 485 485 for (i=0; i < (long) image->colors; i++) … … 506 506 exception=(&image->exception); 507 507 image_view=AcquireCacheView(image); 508 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)509 #pragma omp parallel for s hared(progress,status)508 #if defined(MAGICKCORE_OPENMP_SUPPORT) 509 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 510 510 #endif 511 511 for (y=0; y < (long) image->rows; y++) … … 546 546 proceed; 547 547 548 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)548 #if defined(MAGICKCORE_OPENMP_SUPPORT) 549 549 #pragma omp critical (MagickCore_ColorDecisionListImageChannel) 550 550 #endif … … 654 654 exception); 655 655 image_view=AcquireCacheView(image); 656 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)657 #pragma omp parallel for s hared(progress,status)656 #if defined(MAGICKCORE_OPENMP_SUPPORT) 657 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 658 658 #endif 659 659 for (y=0; y < (long) image->rows; y++) … … 770 770 proceed; 771 771 772 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)772 #if defined(MAGICKCORE_OPENMP_SUPPORT) 773 773 #pragma omp critical (MagickCore_ClutImageChannel) 774 774 #endif … … 887 887 exception=(&image->exception); 888 888 image_view=AcquireCacheView(image); 889 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)890 #pragma omp parallel for s hared(progress,status)889 #if defined(MAGICKCORE_OPENMP_SUPPORT) 890 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 891 891 #endif 892 892 for (y=0; y < (long) image->rows; y++) … … 918 918 proceed; 919 919 920 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)920 #if defined(MAGICKCORE_OPENMP_SUPPORT) 921 921 #pragma omp critical (MagickCore_ContrastImage) 922 922 #endif … … 1225 1225 */ 1226 1226 (void) ResetMagickMemory(stretch_map,0,(MaxMap+1)*sizeof(*stretch_map)); 1227 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1228 #pragma omp parallel for s hared(progress,status)1227 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1228 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1229 1229 #endif 1230 1230 for (i=0; i <= (long) MaxMap; i++) … … 1307 1307 Stretch colormap. 1308 1308 */ 1309 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1310 #pragma omp parallel for s hared(progress,status)1309 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1310 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1311 1311 #endif 1312 1312 for (i=0; i < (long) image->colors; i++) … … 1343 1343 status=MagickTrue; 1344 1344 progress=0; 1345 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1346 #pragma omp parallel for s hared(progress,status)1345 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1346 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1347 1347 #endif 1348 1348 for (y=0; y < (long) image->rows; y++) … … 1407 1407 proceed; 1408 1408 1409 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1409 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1410 1410 #pragma omp critical (MagickCore_ContrastStretchImageChannel) 1411 1411 #endif … … 1522 1522 image_view=AcquireCacheView(image); 1523 1523 enhance_view=AcquireCacheView(enhance_image); 1524 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1525 #pragma omp parallel for s hared(progress,status)1524 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1525 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1526 1526 #endif 1527 1527 for (y=0; y < (long) image->rows; y++) … … 1598 1598 proceed; 1599 1599 1600 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1600 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1601 1601 #pragma omp critical (MagickCore_EnhanceImage) 1602 1602 #endif … … 1755 1755 white=map[(int) MaxMap]; 1756 1756 (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*sizeof(*equalize_map)); 1757 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1758 #pragma omp parallel for s hared(progress,status)1757 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1758 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1759 1759 #endif 1760 1760 for (i=0; i <= (long) MaxMap; i++) … … 1786 1786 Equalize colormap. 1787 1787 */ 1788 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1789 #pragma omp parallel for s hared(progress,status)1788 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1789 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1790 1790 #endif 1791 1791 for (i=0; i < (long) image->colors; i++) … … 1813 1813 exception=(&image->exception); 1814 1814 image_view=AcquireCacheView(image); 1815 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1816 #pragma omp parallel for s hared(progress,status)1815 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1816 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1817 1817 #endif 1818 1818 for (y=0; y < (long) image->rows; y++) … … 1862 1862 proceed; 1863 1863 1864 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1864 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1865 1865 #pragma omp critical (MagickCore_EqualizeImageChannel) 1866 1866 #endif … … 1989 1989 (void) ResetMagickMemory(gamma_map,0,(MaxMap+1)*sizeof(*gamma_map)); 1990 1990 if (gamma != 0.0) 1991 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1992 #pragma omp parallel for 1991 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1992 #pragma omp parallel for schedule(dynamic,4) 1993 1993 #endif 1994 1994 for (i=0; i <= (long) MaxMap; i++) … … 2000 2000 Gamma-correct colormap. 2001 2001 */ 2002 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2003 #pragma omp parallel for s hared(progress,status)2002 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2003 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2004 2004 #endif 2005 2005 for (i=0; i < (long) image->colors; i++) … … 2033 2033 exception=(&image->exception); 2034 2034 image_view=AcquireCacheView(image); 2035 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2036 #pragma omp parallel for s hared(progress,status)2035 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2036 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2037 2037 #endif 2038 2038 for (y=0; y < (long) image->rows; y++) … … 2094 2094 proceed; 2095 2095 2096 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2096 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2097 2097 #pragma omp critical (MagickCore_GammaImageChannel) 2098 2098 #endif … … 2221 2221 exception); 2222 2222 image_view=AcquireCacheView(image); 2223 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2224 #pragma omp parallel for s hared(progress,status)2223 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2224 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2225 2225 #endif 2226 2226 for (y=0; y < (long) image->rows; y++) … … 2308 2308 proceed; 2309 2309 2310 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2310 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2311 2311 #pragma omp critical (MagickCore_HaldClutImageChannel) 2312 2312 #endif … … 2492 2492 (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); 2493 2493 if (image->storage_class == PseudoClass) 2494 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2495 #pragma omp parallel for s hared(progress,status)2494 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2495 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2496 2496 #endif 2497 2497 for (i=0; i < (long) image->colors; i++) … … 2516 2516 exception=(&image->exception); 2517 2517 image_view=AcquireCacheView(image); 2518 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2519 #pragma omp parallel for s hared(progress,status)2518 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2519 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2520 2520 #endif 2521 2521 for (y=0; y < (long) image->rows; y++) … … 2562 2562 proceed; 2563 2563 2564 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2564 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2565 2565 #pragma omp critical (MagickCore_LevelImageChannel) 2566 2566 #endif … … 2649 2649 (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); 2650 2650 if (image->storage_class == PseudoClass) 2651 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2652 #pragma omp parallel for s hared(progress,status)2651 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2652 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2653 2653 #endif 2654 2654 for (i=0; i < (long) image->colors; i++) … … 2673 2673 exception=(&image->exception); 2674 2674 image_view=AcquireCacheView(image); 2675 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2676 #pragma omp parallel for s hared(progress,status)2675 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2676 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2677 2677 #endif 2678 2678 for (y=0; y < (long) image->rows; y++) … … 2719 2719 proceed; 2720 2720 2721 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2721 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2722 2722 #pragma omp critical (MagickCore_LevelizeImageChannel) 2723 2723 #endif … … 3122 3122 Modulate colormap. 3123 3123 */ 3124 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3125 #pragma omp parallel for s hared(progress,status)3124 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3125 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3126 3126 #endif 3127 3127 for (i=0; i < (long) image->colors; i++) … … 3159 3159 exception=(&image->exception); 3160 3160 image_view=AcquireCacheView(image); 3161 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3162 #pragma omp parallel for s hared(progress,status)3161 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3162 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3163 3163 #endif 3164 3164 for (y=0; y < (long) image->rows; y++) … … 3211 3211 proceed; 3212 3212 3213 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3213 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3214 3214 #pragma omp critical (MagickCore_ModulateImage) 3215 3215 #endif … … 3294 3294 Negate colormap. 3295 3295 */ 3296 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3297 #pragma omp parallel for s hared(progress,status)3296 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3297 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3298 3298 #endif 3299 3299 for (i=0; i < (long) image->colors; i++) … … 3323 3323 if (grayscale != MagickFalse) 3324 3324 { 3325 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3326 #pragma omp parallel for s hared(progress,status)3325 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3326 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3327 3327 #endif 3328 3328 for (y=0; y < (long) image->rows; y++) … … 3378 3378 proceed; 3379 3379 3380 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3380 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3381 3381 #pragma omp critical (MagickCore_NegateImageChannel) 3382 3382 #endif … … 3393 3393 Negate image. 3394 3394 */ 3395 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3396 #pragma omp parallel for s hared(progress,status)3395 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3396 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3397 3397 #endif 3398 3398 for (y=0; y < (long) image->rows; y++) … … 3438 3438 proceed; 3439 3439 3440 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3440 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3441 3441 #pragma omp critical (MagickCore_NegateImageChannel) 3442 3442 #endif … … 3602 3602 image->filename); 3603 3603 (void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map)); 3604 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3605 #pragma omp parallel for s hared(progress,status)3604 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3605 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3606 3606 #endif 3607 3607 for (i=0; i <= (long) MaxMap; i++) … … 3632 3632 Sigmoidal-contrast enhance colormap. 3633 3633 */ 3634 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3635 #pragma omp parallel for s hared(progress,status)3634 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3635 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3636 3636 #endif 3637 3637 for (i=0; i < (long) image->colors; i++) … … 3658 3658 exception=(&image->exception); 3659 3659 image_view=AcquireCacheView(image); 3660 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3661 #pragma omp parallel for s hared(progress,status)3660 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3661 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3662 3662 #endif 3663 3663 for (y=0; y < (long) image->rows; y++) … … 3704 3704 proceed; 3705 3705 3706 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3706 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3707 3707 #pragma omp critical (MagickCore_SigmoidalContrastImageChannel) 3708 3708 #endif -
ImageMagick/trunk/magick/fourier.c
r404 r532 491 491 return(MagickFalse); 492 492 } 493 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)493 #if defined(MAGICKCORE_OPENMP_SUPPORT) 494 494 #pragma omp critical (MagickCore_ForwardFourierTransform) 495 495 #endif … … 654 654 status=MagickTrue; 655 655 is_gray=IsGrayImage(image,exception); 656 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)657 #pragma omp parallel for s hared(status)656 #if defined(MAGICKCORE_OPENMP_SUPPORT) 657 #pragma omp parallel for schedule(dynamic,4) shared(status) 658 658 #endif 659 659 for (i=0L; i < 5L; i++) … … 1034 1034 return(MagickFalse); 1035 1035 } 1036 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1036 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1037 1037 #pragma omp critical (MagickCore_InverseFourierTransform) 1038 1038 #endif … … 1197 1197 if ((is_gray != MagickFalse) && (images->next != (Image *) NULL)) 1198 1198 is_gray=IsGrayImage(images->next,exception); 1199 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1200 #pragma omp parallel for s hared(status)1199 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1200 #pragma omp parallel for schedule(dynamic,4) shared(status) 1201 1201 #endif 1202 1202 for (i=0L; i < 5L; i++) -
ImageMagick/trunk/magick/fx.c
r530 r532 335 335 noise_view=AcquireCacheView(noise_image); 336 336 #if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) 337 #pragma omp parallel for s hared(progress,status)337 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 338 338 #endif 339 339 for (y=0; y < (long) image->rows; y++) … … 400 400 proceed; 401 401 402 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)402 #if defined(MAGICKCORE_OPENMP_SUPPORT) 403 403 #pragma omp critical (MagickCore_AverageImages) 404 404 #endif … … 491 491 shift_view=AcquireCacheView(shift_image); 492 492 #if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) 493 #pragma omp parallel for s hared(progress,status)493 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 494 494 #endif 495 495 for (y=0; y < (long) image->rows; y++) … … 738 738 colorize_view=AcquireCacheView(colorize_image); 739 739 #if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) 740 #pragma omp parallel for s hared(progress,status)740 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 741 741 #endif 742 742 for (y=0; y < (long) image->rows; y++) … … 958 958 image_view=AcquireCacheView(image); 959 959 convolve_view=AcquireCacheView(convolve_image); 960 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)961 #pragma omp parallel for s hared(progress,status)960 #if defined(MAGICKCORE_OPENMP_SUPPORT) 961 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 962 962 #endif 963 963 for (y=0; y < (long) image->rows; y++) … … 1147 1147 proceed; 1148 1148 1149 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1149 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1150 1150 #pragma omp critical (MagickCore_ConvolveImageChannel) 1151 1151 #endif … … 1473 1473 random_info=AcquireRandomInfoThreadSet(); 1474 1474 image_view=AcquireCacheView(image); 1475 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1476 #pragma omp parallel for s hared(progress,status)1475 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1476 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1477 1477 #endif 1478 1478 for (y=0; y < (long) image->rows; y++) … … 1527 1527 proceed; 1528 1528 1529 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1529 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1530 1530 #pragma omp critical (MagickCore_EvaluateImageChannel) 1531 1531 #endif … … 1705 1705 progress=0; 1706 1706 image_view=AcquireCacheView(image); 1707 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1708 #pragma omp parallel for s hared(progress,status)1707 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1708 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1709 1709 #endif 1710 1710 for (y=0; y < (long) image->rows; y++) … … 1761 1761 proceed; 1762 1762 1763 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1763 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1764 1764 #pragma omp critical (MagickCore_FunctionImageChannel) 1765 1765 #endif … … 3541 3541 progress=0; 3542 3542 fx_view=AcquireCacheView(fx_image); 3543 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3544 #pragma omp parallel for s hared(progress,status)3543 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3544 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3545 3545 #endif 3546 3546 for (y=0; y < (long) fx_image->rows; y++) … … 3617 3617 proceed; 3618 3618 3619 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3619 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3620 3620 #pragma omp critical (MagickCore_FxImageChannel) 3621 3621 #endif … … 3744 3744 image_view=AcquireCacheView(image); 3745 3745 implode_view=AcquireCacheView(implode_image); 3746 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3747 #pragma omp parallel for s hared(progress,status)3746 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3747 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 3748 3748 #endif 3749 3749 for (y=0; y < (long) image->rows; y++) … … 3814 3814 proceed; 3815 3815 3816 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3816 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3817 3817 #pragma omp critical (MagickCore_ImplodeImage) 3818 3818 #endif … … 3966 3966 image_view=AcquireCacheView(morph_image); 3967 3967 morph_view=AcquireCacheView(morph_images); 3968 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3969 #pragma omp parallel for s hared(status)3968 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3969 #pragma omp parallel for schedule(dynamic,4) shared(status) 3970 3970 #endif 3971 3971 for (y=0; y < (long) morph_images->rows; y++) … … 4029 4029 proceed; 4030 4030 4031 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4031 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4032 4032 #pragma omp critical (MagickCore_MorphImages) 4033 4033 #endif … … 4593 4593 image_view=AcquireCacheView(image); 4594 4594 recolor_view=AcquireCacheView(recolor_image); 4595 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4596 #pragma omp parallel for s hared(progress,status)4595 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4596 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 4597 4597 #endif 4598 4598 for (y=0; y < (long) image->rows; y++) … … 4717 4717 proceed; 4718 4718 4719 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4719 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4720 4720 #pragma omp critical (MagickCore_RecolorImage) 4721 4721 #endif … … 4806 4806 image_view=AcquireCacheView(image); 4807 4807 sepia_view=AcquireCacheView(sepia_image); 4808 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4809 #pragma omp parallel for s hared(progress,status)4808 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4809 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 4810 4810 #endif 4811 4811 for (y=0; y < (long) image->rows; y++) … … 4860 4860 proceed; 4861 4861 4862 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4862 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4863 4863 #pragma omp critical (MagickCore_SepiaToneImage) 4864 4864 #endif … … 4964 4964 progress=0; 4965 4965 image_view=AcquireCacheView(border_image); 4966 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)4967 #pragma omp parallel for s hared(progress,status)4966 #if defined(MAGICKCORE_OPENMP_SUPPORT) 4967 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 4968 4968 #endif 4969 4969 for (y=0; y < (long) border_image->rows; y++) … … 5003 5003 proceed; 5004 5004 5005 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5005 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5006 5006 #pragma omp critical (MagickCore_ShadowImage) 5007 5007 #endif … … 5253 5253 exception=(&image->exception); 5254 5254 image_view=AcquireCacheView(image); 5255 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5256 #pragma omp parallel for s hared(progress,status)5255 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5256 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 5257 5257 #endif 5258 5258 for (y=0; y < (long) image->rows; y++) … … 5290 5290 proceed; 5291 5291 5292 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5292 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5293 5293 #pragma omp critical (MagickCore_SolarizeImage) 5294 5294 #endif … … 5694 5694 image_view=AcquireCacheView(image); 5695 5695 swirl_view=AcquireCacheView(swirl_image); 5696 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5697 #pragma omp parallel for s hared(progress,status)5696 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5697 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 5698 5698 #endif 5699 5699 for (y=0; y < (long) image->rows; y++) … … 5765 5765 proceed; 5766 5766 5767 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5767 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5768 5768 #pragma omp critical (MagickCore_SwirlImage) 5769 5769 #endif … … 5891 5891 image_view=AcquireCacheView(image); 5892 5892 tint_view=AcquireCacheView(tint_image); 5893 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5894 #pragma omp parallel for s hared(progress,status)5893 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5894 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 5895 5895 #endif 5896 5896 for (y=0; y < (long) image->rows; y++) … … 5946 5946 proceed; 5947 5947 5948 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)5948 #if defined(MAGICKCORE_OPENMP_SUPPORT) 5949 5949 #pragma omp critical (MagickCore_TintImage) 5950 5950 #endif … … 6157 6157 resample_filter=AcquireResampleFilterThreadSet(image,MagickTrue,exception); 6158 6158 wave_view=AcquireCacheView(wave_image); 6159 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)6160 #pragma omp parallel for s hared(progress,status)6159 #if defined(MAGICKCORE_OPENMP_SUPPORT) 6160 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 6161 6161 #endif 6162 6162 for (y=0; y < (long) wave_image->rows; y++) … … 6203 6203 proceed; 6204 6204 6205 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)6205 #if defined(MAGICKCORE_OPENMP_SUPPORT) 6206 6206 #pragma omp critical (MagickCore_WaveImage) 6207 6207 #endif -
ImageMagick/trunk/magick/image.c
r460 r532 551 551 y_offset-=geometry.y; 552 552 image_view=AcquireCacheView(image); 553 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)554 #pragma omp parallel for s hared(status)553 #if defined(MAGICKCORE_OPENMP_SUPPORT) 554 #pragma omp parallel for schedule(dynamic,4) shared(status) 555 555 #endif 556 556 for (y=0; y < (long) image->rows; y++) … … 1092 1092 progress=0; 1093 1093 combine_view=AcquireCacheView(combine_image); 1094 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1095 #pragma omp parallel for s hared(progress,status)1094 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1095 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1096 1096 #endif 1097 1097 for (y=0; y < (long) combine_image->rows; y++) … … 1215 1215 proceed; 1216 1216 1217 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1217 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1218 1218 #pragma omp critical (MagickCore_CombineImages) 1219 1219 #endif … … 1879 1879 GetMagickPixelPacket(image,&zero); 1880 1880 image_view=AcquireCacheView(image); 1881 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1882 #pragma omp parallel for s hared(status)1881 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1882 #pragma omp parallel for schedule(dynamic,4) shared(status) 1883 1883 #endif 1884 1884 for (y=0; y < (long) image->rows; y++) … … 2339 2339 exception=(&image->exception); 2340 2340 image_view=AcquireCacheView(image); 2341 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2342 #pragma omp parallel for s hared(progress,status)2341 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2342 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2343 2343 #endif 2344 2344 for (y=0; y < (long) image->rows; y++) … … 2449 2449 proceed; 2450 2450 2451 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2451 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2452 2452 #pragma omp critical (MagickCore_SeparateImageChannel) 2453 2453 #endif … … 2626 2626 exception=(&image->exception); 2627 2627 image_view=AcquireCacheView(image); 2628 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2629 #pragma omp parallel for s hared(status)2628 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2629 #pragma omp parallel for schedule(dynamic,4) shared(status) 2630 2630 #endif 2631 2631 for (y=0; y < (long) image->rows; y++) … … 2802 2802 exception=(&image->exception); 2803 2803 image_view=AcquireCacheView(image); 2804 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2805 #pragma omp parallel for s hared(status)2804 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2805 #pragma omp parallel for schedule(dynamic,4) shared(status) 2806 2806 #endif 2807 2807 for (y=0; y < (long) image->rows; y++) … … 3469 3469 exception=(&image->exception); 3470 3470 image_view=AcquireCacheView(image); 3471 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3472 #pragma omp parallel for s hared(status)3471 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3472 #pragma omp parallel for schedule(dynamic,4) shared(status) 3473 3473 #endif 3474 3474 for (y=0; y < (long) image->rows; y++) -
ImageMagick/trunk/magick/paint.c
r404 r532 601 601 image_view=AcquireCacheView(image); 602 602 paint_view=AcquireCacheView(paint_image); 603 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)604 #pragma omp parallel for s hared(progress,status)603 #if defined(MAGICKCORE_OPENMP_SUPPORT) 604 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 605 605 #endif 606 606 for (y=0; y < (long) image->rows; y++) … … 686 686 proceed; 687 687 688 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)688 #if defined(MAGICKCORE_OPENMP_SUPPORT) 689 689 #pragma omp critical (MagickCore_OilPaintImage) 690 690 #endif … … 790 790 GetMagickPixelPacket(image,&zero); 791 791 image_view=AcquireCacheView(image); 792 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)793 #pragma omp parallel for s hared(progress,status)792 #if defined(MAGICKCORE_OPENMP_SUPPORT) 793 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 794 794 #endif 795 795 for (y=0; y < (long) image->rows; y++) … … 843 843 proceed; 844 844 845 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)845 #if defined(MAGICKCORE_OPENMP_SUPPORT) 846 846 #pragma omp critical (MagickCore_OpaquePaintImageChannel) 847 847 #endif … … 932 932 GetMagickPixelPacket(image,&zero); 933 933 image_view=AcquireCacheView(image); 934 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)935 #pragma omp parallel for s hared(progress,status)934 #if defined(MAGICKCORE_OPENMP_SUPPORT) 935 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 936 936 #endif 937 937 for (y=0; y < (long) image->rows; y++) … … 973 973 proceed; 974 974 975 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)975 #if defined(MAGICKCORE_OPENMP_SUPPORT) 976 976 #pragma omp critical (MagickCore_TransparentPaintImage) 977 977 #endif … … 1062 1062 exception=(&image->exception); 1063 1063 image_view=AcquireCacheView(image); 1064 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1065 #pragma omp parallel for s hared(progress,status)1064 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1065 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1066 1066 #endif 1067 1067 for (y=0; y < (long) image->rows; y++) … … 1110 1110 proceed; 1111 1111 1112 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1112 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1113 1113 #pragma omp critical (MagickCore_TransparentPaintImageChroma) 1114 1114 #endif -
ImageMagick/trunk/magick/prepress.c
r404 r532 109 109 exception=(&image->exception); 110 110 image_view=AcquireCacheView(image); 111 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)112 #pragma omp parallel for s hared(status)111 #if defined(MAGICKCORE_OPENMP_SUPPORT) 112 #pragma omp parallel for schedule(dynamic,4) shared(status) 113 113 #endif 114 114 for (y=0; y < (long) image->rows; y++) … … 137 137 density=(double) p->red+p->green+p->blue+indexes[x]; 138 138 if (density > total_ink_density) 139 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)139 #if defined(MAGICKCORE_OPENMP_SUPPORT) 140 140 #pragma omp critical (MagickCore_GetImageTotalInkDensity) 141 141 #endif -
ImageMagick/trunk/magick/profile.c
r404 r532 1151 1151 progress=0; 1152 1152 image_view=AcquireCacheView(image); 1153 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1154 #pragma omp parallel for s hared(status)1153 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1154 #pragma omp parallel for schedule(dynamic,4) shared(status) 1155 1155 #endif 1156 1156 for (y=0; y < (long) image->rows; y++) … … 1228 1228 proceed; 1229 1229 1230 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1230 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1231 1231 #pragma omp critical (MagickCore_ProfileImage) 1232 1232 #endif -
ImageMagick/trunk/magick/quantize.c
r404 r532 3023 3023 exception=(&image->exception); 3024 3024 image_view=AcquireCacheView(image); 3025 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3026 #pragma omp parallel for s hared(status)3025 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3026 #pragma omp parallel for schedule(dynamic,4) shared(status) 3027 3027 #endif 3028 3028 for (y=0; y < (long) image->rows; y++) … … 3055 3055 if (colormap_index[intensity] < 0) 3056 3056 { 3057 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3057 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3058 3058 #pragma omp critical (MagickCore_SetGrayscaleImage) 3059 3059 #endif … … 3099 3099 exception=(&image->exception); 3100 3100 image_view=AcquireCacheView(image); 3101 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)3102 #pragma omp parallel for s hared(status)3101 #if defined(MAGICKCORE_OPENMP_SUPPORT) 3102 #pragma omp parallel for schedule(dynamic,4) shared(status) 3103 3103 #endif 3104 3104 for (y=0; y < (long) image->rows; y++) -
ImageMagick/trunk/magick/resize.c
r408 r532 1722 1722 image_view=AcquireCacheView(image); 1723 1723 resize_view=AcquireCacheView(resize_image); 1724 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1724 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1725 1725 #pragma omp parallel for shared(status) 1726 1726 #endif … … 1891 1891 proceed; 1892 1892 1893 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1893 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1894 1894 #pragma omp critical (MagickCore_HorizontalFilter) 1895 1895 #endif … … 1963 1963 image_view=AcquireCacheView(image); 1964 1964 resize_view=AcquireCacheView(resize_image); 1965 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1965 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1966 1966 #pragma omp parallel for shared(status) 1967 1967 #endif … … 2132 2132 proceed; 2133 2133 2134 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2134 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2135 2135 #pragma omp critical (MagickCore_VerticalFilter) 2136 2136 #endif … … 2336 2336 image_view=AcquireCacheView(image); 2337 2337 sample_view=AcquireCacheView(sample_image); 2338 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2339 #pragma omp parallel for s hared(progress,status)2338 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2339 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2340 2340 #endif 2341 2341 for (y=0; y < (long) sample_image->rows; y++) … … 2389 2389 proceed; 2390 2390 2391 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2391 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2392 2392 #pragma omp critical (MagickCore_SampleImage) 2393 2393 #endif -
ImageMagick/trunk/magick/segment.c
r404 r532 395 395 proceed; 396 396 397 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)397 #if defined(MAGICKCORE_OPENMP_SUPPORT) 398 398 #pragma omp critical (MagickCore_Classify) 399 399 #endif … … 520 520 exception=(&image->exception); 521 521 image_view=AcquireCacheView(image); 522 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)523 #pragma omp parallel for s hared(progress,status)522 #if defined(MAGICKCORE_OPENMP_SUPPORT) 523 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 524 524 #endif 525 525 for (y=0; y < (long) image->rows; y++) … … 633 633 proceed; 634 634 635 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)635 #if defined(MAGICKCORE_OPENMP_SUPPORT) 636 636 #pragma omp critical (MagickCore_Classify) 637 637 #endif -
ImageMagick/trunk/magick/shear.c
r404 r532 447 447 448 448 #if !defined(MAGICKCORE_HAVE_PPREAD) 449 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)449 #if defined(MAGICKCORE_OPENMP_SUPPORT) 450 450 #pragma omp critical (MagickCore_ReadRadonCell) 451 451 #endif … … 491 491 492 492 #if !defined(MAGICKCORE_HAVE_PWRITE) 493 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)493 #if defined(MAGICKCORE_OPENMP_SUPPORT) 494 494 #pragma omp critical (MagickCore_WriteRadonCell) 495 495 #endif … … 627 627 q=swap; 628 628 } 629 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)630 #pragma omp parallel for 629 #if defined(MAGICKCORE_OPENMP_SUPPORT) 630 #pragma omp parallel for schedule(dynamic,4) 631 631 #endif 632 632 for (x=0; x < (long) p->width; x++) … … 707 707 status=MagickTrue; 708 708 image_view=AcquireCacheView(image); 709 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)710 #pragma omp parallel for s hared(status)709 #if defined(MAGICKCORE_OPENMP_SUPPORT) 710 #pragma omp parallel for schedule(dynamic,4) shared(status) 711 711 #endif 712 712 for (y=0; y < (long) image->rows; y++) … … 758 758 RadonProjection(source_cells,destination_cells,-1,projection); 759 759 (void) ResetRadonCells(source_cells); 760 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)761 #pragma omp parallel for s hared(status)760 #if defined(MAGICKCORE_OPENMP_SUPPORT) 761 #pragma omp parallel for schedule(dynamic,4) shared(status) 762 762 #endif 763 763 for (y=0; y < (long) image->rows; y++) … … 1075 1075 */ 1076 1076 GetPixelCacheTileSize(image,&tile_width,&tile_height); 1077 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1078 #pragma omp parallel for s hared(progress, status)1077 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1078 #pragma omp parallel for schedule(dynamic,4) shared(progress, status) 1079 1079 #endif 1080 1080 for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height) … … 1189 1189 Rotate 180 degrees. 1190 1190 */ 1191 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1192 #pragma omp parallel for s hared(progress, status)1191 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1192 #pragma omp parallel for schedule(dynamic,4) shared(progress, status) 1193 1193 #endif 1194 1194 for (y=0; y < (long) image->rows; y++) … … 1265 1265 */ 1266 1266 GetPixelCacheTileSize(image,&tile_width,&tile_height); 1267 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1268 #pragma omp parallel for s hared(progress, status)1267 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1268 #pragma omp parallel for schedule(dynamic,4) shared(progress, status) 1269 1269 #endif 1270 1270 for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height) … … 1461 1461 exception=(&image->exception); 1462 1462 image_view=AcquireCacheView(image); 1463 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1464 #pragma omp parallel for s hared(progress, status)1463 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1464 #pragma omp parallel for schedule(dynamic,4) shared(progress, status) 1465 1465 #endif 1466 1466 for (y=0; y < (long) height; y++) … … 1591 1591 proceed; 1592 1592 1593 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1593 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1594 1594 #pragma omp critical (MagickCore_XShearImage) 1595 1595 #endif … … 1681 1681 exception=(&image->exception); 1682 1682 image_view=AcquireCacheView(image); 1683 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1684 #pragma omp parallel for s hared(progress, status)1683 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1684 #pragma omp parallel for schedule(dynamic,4) shared(progress, status) 1685 1685 #endif 1686 1686 for (x=0; x < (long) width; x++) … … 1811 1811 proceed; 1812 1812 1813 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1813 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1814 1814 #pragma omp critical (MagickCore_YShearImage) 1815 1815 #endif -
ImageMagick/trunk/magick/statistic.c
r404 r532 228 228 number_images=GetImageListLength(image); 229 229 average_view=AcquireCacheView(average_image); 230 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)231 #pragma omp parallel for s hared(progress,status)230 #if defined(MAGICKCORE_OPENMP_SUPPORT) 231 #pragma omp parallel for schedule(dynamic) shared(progress,status) 232 232 #endif 233 233 for (y=0; y < (long) average_image->rows; y++) … … 325 325 proceed; 326 326 327 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)327 #if defined(MAGICKCORE_OPENMP_SUPPORT) 328 328 #pragma omp critical (MagickCore_AverageImages) 329 329 #endif -
ImageMagick/trunk/magick/threshold.c
r404 r532 192 192 image_view=AcquireCacheView(image); 193 193 threshold_view=AcquireCacheView(threshold_image); 194 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)195 #pragma omp parallel for s hared(progress,status)194 #if defined(MAGICKCORE_OPENMP_SUPPORT) 195 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 196 196 #endif 197 197 for (y=0; y < (long) image->rows; y++) … … 287 287 proceed; 288 288 289 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)289 #if defined(MAGICKCORE_OPENMP_SUPPORT) 290 290 #pragma omp critical (MagickCore_AdaptiveThresholdImage) 291 291 #endif … … 386 386 exception=(&image->exception); 387 387 image_view=AcquireCacheView(image); 388 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)389 #pragma omp parallel for s hared(progress,status)388 #if defined(MAGICKCORE_OPENMP_SUPPORT) 389 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 390 390 #endif 391 391 for (y=0; y < (long) image->rows; y++) … … 454 454 proceed; 455 455 456 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)456 #if defined(MAGICKCORE_OPENMP_SUPPORT) 457 457 #pragma omp critical (MagickCore_BilevelImageChannel) 458 458 #endif … … 572 572 progress=0; 573 573 image_view=AcquireCacheView(image); 574 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)575 #pragma omp parallel for s hared(progress,status)574 #if defined(MAGICKCORE_OPENMP_SUPPORT) 575 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 576 576 #endif 577 577 for (y=0; y < (long) image->rows; y++) … … 637 637 proceed; 638 638 639 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)639 #if defined(MAGICKCORE_OPENMP_SUPPORT) 640 640 #pragma omp critical (MagickCore_BlackThresholdImageChannel) 641 641 #endif … … 747 747 exception=(&image->exception); 748 748 image_view=AcquireCacheView(image); 749 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)750 #pragma omp parallel for s hared(progress,status)749 #if defined(MAGICKCORE_OPENMP_SUPPORT) 750 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 751 751 #endif 752 752 for (y=0; y < (long) image->rows; y++) … … 792 792 proceed; 793 793 794 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)794 #if defined(MAGICKCORE_OPENMP_SUPPORT) 795 795 #pragma omp critical (MagickCore_ClampImageChannel) 796 796 #endif … … 1477 1477 progress=0; 1478 1478 image_view=AcquireCacheView(image); 1479 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1480 #pragma omp parallel for s hared(progress,status)1479 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1480 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1481 1481 #endif 1482 1482 for (y=0; y < (long) image->rows; y++) … … 1560 1560 proceed; 1561 1561 1562 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1562 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1563 1563 #pragma omp critical (MagickCore_OrderedPosterizeImageChannel) 1564 1564 #endif … … 1696 1696 random_info=AcquireRandomInfoThreadSet(); 1697 1697 image_view=AcquireCacheView(image); 1698 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1699 #pragma omp parallel for s hared(progress,status)1698 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1699 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1700 1700 #endif 1701 1701 for (y=0; y < (long) image->rows; y++) … … 1753 1753 proceed; 1754 1754 1755 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1755 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1756 1756 #pragma omp critical (MagickCore_RandomThresholdImageChannel) 1757 1757 #endif … … 1773 1773 random_info=AcquireRandomInfoThreadSet(); 1774 1774 image_view=AcquireCacheView(image); 1775 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1776 #pragma omp parallel for s hared(progress,status)1775 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1776 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1777 1777 #endif 1778 1778 for (y=0; y < (long) image->rows; y++) … … 1881 1881 proceed; 1882 1882 1883 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1883 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1884 1884 #pragma omp critical (MagickCore_RandomThresholdImageChannel) 1885 1885 #endif … … 2000 2000 progress=0; 2001 2001 image_view=AcquireCacheView(image); 2002 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2003 #pragma omp parallel for s hared(progress,status)2002 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2003 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2004 2004 #endif 2005 2005 for (y=0; y < (long) image->rows; y++) … … 2050 2050 proceed; 2051 2051 2052 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2052 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2053 2053 #pragma omp critical (MagickCore_WhiteThresholdImageChannel) 2054 2054 #endif -
ImageMagick/trunk/magick/transform.c
r404 r532 586 586 image_view=AcquireCacheView(image); 587 587 crop_view=AcquireCacheView(crop_image); 588 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)589 #pragma omp parallel for s hared(progress,status)588 #if defined(MAGICKCORE_OPENMP_SUPPORT) 589 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 590 590 #endif 591 591 for (y=0; y < (long) crop_image->rows; y++) … … 630 630 proceed; 631 631 632 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)632 #if defined(MAGICKCORE_OPENMP_SUPPORT) 633 633 #pragma omp critical (MagickCore_CropImage) 634 634 #endif … … 714 714 image_view=AcquireCacheView(image); 715 715 excerpt_view=AcquireCacheView(excerpt_image); 716 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)717 #pragma omp parallel for s hared(progress,status)716 #if defined(MAGICKCORE_OPENMP_SUPPORT) 717 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 718 718 #endif 719 719 for (y=0; y < (long) excerpt_image->rows; y++) … … 756 756 proceed; 757 757 758 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)758 #if defined(MAGICKCORE_OPENMP_SUPPORT) 759 759 #pragma omp critical (MagickCore_ExcerptImage) 760 760 #endif … … 895 895 image_view=AcquireCacheView(image); 896 896 flip_view=AcquireCacheView(flip_image); 897 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)898 #pragma omp parallel for s hared(progress,status)897 #if defined(MAGICKCORE_OPENMP_SUPPORT) 898 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 899 899 #endif 900 900 for (y=0; y < (long) flip_image->rows; y++) … … 938 938 proceed; 939 939 940 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)940 #if defined(MAGICKCORE_OPENMP_SUPPORT) 941 941 #pragma omp critical (MagickCore_FlipImage) 942 942 #endif … … 1013 1013 image_view=AcquireCacheView(image); 1014 1014 flop_view=AcquireCacheView(flop_image); 1015 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1016 #pragma omp parallel for s hared(progress,status)1015 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1016 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1017 1017 #endif 1018 1018 for (y=0; y < (long) flop_image->rows; y++) … … 1060 1060 proceed; 1061 1061 1062 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1062 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1063 1063 #pragma omp critical (MagickCore_FlopImage) 1064 1064 #endif … … 1124 1124 source_view=AcquireCacheView(source); 1125 1125 destination_view=AcquireCacheView(destination); 1126 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1127 #pragma omp parallel for s hared(status)1126 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1127 #pragma omp parallel for schedule(dynamic,4) shared(status) 1128 1128 #endif 1129 1129 for (y=0; y < (long) rows; y++) … … 1439 1439 image_view=AcquireCacheView(image); 1440 1440 splice_view=AcquireCacheView(splice_image); 1441 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1442 #pragma omp parallel for s hared(progress,status)1441 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1442 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1443 1443 #endif 1444 1444 for (y=0; y < (long) splice_geometry.y; y++) … … 1505 1505 proceed; 1506 1506 1507 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1507 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1508 1508 #pragma omp critical (MagickCore_TransposeImage) 1509 1509 #endif … … 1514 1514 } 1515 1515 } 1516 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1517 #pragma omp parallel for s hared(progress,status)1516 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1517 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1518 1518 #endif 1519 1519 for (y=(long) (splice_geometry.y+splice_geometry.height); … … 1581 1581 proceed; 1582 1582 1583 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1583 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1584 1584 #pragma omp critical (MagickCore_TransposeImage) 1585 1585 #endif … … 1876 1876 image_view=AcquireCacheView(image); 1877 1877 transpose_view=AcquireCacheView(transpose_image); 1878 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1879 #pragma omp parallel for s hared(progress,status)1878 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1879 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 1880 1880 #endif 1881 1881 for (y=0; y < (long) image->rows; y++) … … 1918 1918 proceed; 1919 1919 1920 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)1920 #if defined(MAGICKCORE_OPENMP_SUPPORT) 1921 1921 #pragma omp critical (MagickCore_TransposeImage) 1922 1922 #endif … … 2004 2004 image_view=AcquireCacheView(image); 2005 2005 transverse_view=AcquireCacheView(transverse_image); 2006 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2007 #pragma omp parallel for s hared(progress,status)2006 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2007 #pragma omp parallel for schedule(dynamic,4) shared(progress,status) 2008 2008 #endif 2009 2009 for (y=0; y < (long) image->rows; y++) … … 2054 2054 proceed; 2055 2055 2056 #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)2056 #if defined(MAGICKCORE_OPENMP_SUPPORT) 2057 2057 #pragma omp critical (MagickCore_TransverseImage) 2058 2058 #endif -
ImageMagick/trunk/wand/mogrify.c
r505 r532 178 178 { 179 179 SetOpenMPNested(1);