Changeset 11650 for ImageMagick/trunk

Show
Ignore:
Timestamp:
07/17/08 07:47:49 (6 weeks ago)
Author:
cristy
Message:
 
Location:
ImageMagick/trunk/magick
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • ImageMagick/trunk/magick/cache.c

    r11608 r11650  
    350350  const unsigned long rows,const unsigned long nexus,ExceptionInfo *exception) 
    351351{ 
    352   CacheInfo 
    353     *cache_info; 
    354  
    355352  const PixelPacket 
    356353    *pixels; 
    … …  
    360357 
    361358  /* 
    362     Transfer pixels from the cache. 
     359    Return virtual cache region. 
    363360  */ 
    364361  region.x=x; 
    … …  
    367364  region.height=rows; 
    368365  pixels=SetNexus(image,&region,nexus); 
    369   if (pixels == (PixelPacket *) NULL) 
    370     return((const PixelPacket *) NULL); 
    371   cache_info=(CacheInfo *) image->cache; 
    372   if (IsNexusInCore(cache_info,nexus) != MagickFalse) 
    373     return(pixels); 
    374   if (ReadCachePixels(cache_info,nexus,exception) == MagickFalse) 
    375     return((const PixelPacket *) NULL); 
    376   if ((cache_info->storage_class == PseudoClass) || 
    377       (cache_info->colorspace == CMYKColorspace)) 
    378     if (ReadCacheIndexes(cache_info,nexus,exception) == MagickFalse) 
    379       return((const PixelPacket *) NULL); 
    380366  return(pixels); 
    381367} 

  • ImageMagick/trunk/magick/distort.c

    r11649 r11650  
    13881388  resample_filter=AcquireResampleFilterThreadSet(image,exception); 
    13891389  distort_view=AcquireCacheViewThreadSet(distort_image); 
    1390   /* #pragma omp parallel for */ 
     1390  #pragma omp parallel for 
    13911391  for (j=0; j < (long) distort_image->rows; j++) 
    13921392  {