Changeset 7279
- Timestamp:
- 03/30/12 09:04:39 (14 months ago)
- Location:
- ImageMagick/trunk
- Files:
-
- 20 edited
-
MagickCore/annotate.c (modified) (1 diff)
-
MagickCore/compare.c (modified) (1 diff)
-
MagickCore/decorate.c (modified) (1 diff)
-
MagickCore/display.c (modified) (3 diffs)
-
MagickCore/distort.c (modified) (1 diff)
-
MagickCore/draw.c (modified) (1 diff)
-
MagickCore/fx.c (modified) (5 diffs)
-
MagickCore/image.c (modified) (3 diffs)
-
MagickCore/layer.c (modified) (9 diffs)
-
MagickCore/montage.c (modified) (1 diff)
-
MagickCore/morphology.c (modified) (4 diffs)
-
MagickCore/transform.c (modified) (1 diff)
-
MagickCore/xwindow.c (modified) (4 diffs)
-
MagickWand/compare.c (modified) (1 diff)
-
MagickWand/composite.c (modified) (3 diffs)
-
MagickWand/mogrify.c (modified) (5 diffs)
-
MagickWand/operation.c (modified) (1 diff)
-
coders/msl.c (modified) (4 diffs)
-
coders/pict.c (modified) (2 diffs)
-
coders/xcf.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ImageMagick/trunk/MagickCore/annotate.c
r7274 r7279 1845 1845 } 1846 1846 annotate_view=DestroyCacheView(annotate_view); 1847 (void) CompositeImage(image,annotate_image,OverCompositeOp,Magick False,1847 (void) CompositeImage(image,annotate_image,OverCompositeOp,MagickTrue, 1848 1848 (ssize_t) ceil(offset->x-0.5),(ssize_t) ceil(offset->y-(metrics->ascent+ 1849 1849 metrics->descent)-0.5),exception); -
ImageMagick/trunk/MagickCore/compare.c
r7274 r7279 265 265 image_view=DestroyCacheView(image_view); 266 266 (void) CompositeImage(difference_image,highlight_image,image->compose, 267 Magick False,0,0,exception);267 MagickTrue,0,0,exception); 268 268 highlight_image=DestroyImage(highlight_image); 269 269 if (status == MagickFalse) -
ImageMagick/trunk/MagickCore/decorate.c
r7274 r7279 594 594 y=(ssize_t) (frame_info->outer_bevel+(frame_info->y-bevel_width)+ 595 595 frame_info->inner_bevel); 596 (void) CompositeImage(frame_image,image,compose,Magick False,x,y,596 (void) CompositeImage(frame_image,image,compose,MagickTrue,x,y, 597 597 exception); 598 598 } -
ImageMagick/trunk/MagickCore/display.c
r7274 r7279 4356 4356 Composite image with X Image window. 4357 4357 */ 4358 (void) CompositeImage(image,composite_image,compose,Magick False,4358 (void) CompositeImage(image,composite_image,compose,MagickTrue, 4359 4359 composite_info.x,composite_info.y,exception); 4360 4360 composite_image=DestroyImage(composite_image); … … 10929 10929 Paste image with X Image window. 10930 10930 */ 10931 (void) CompositeImage(image,paste_image,compose,Magick False,paste_info.x,10931 (void) CompositeImage(image,paste_image,compose,MagickTrue,paste_info.x, 10932 10932 paste_info.y,exception); 10933 10933 paste_image=DestroyImage(paste_image); … … 11664 11664 windows->image.orphan=MagickFalse; 11665 11665 (void) CompositeImage(*image,roi_image,CopyCompositeOp, 11666 Magick False,crop_info.x,crop_info.y,exception);11666 MagickTrue,crop_info.x,crop_info.y,exception); 11667 11667 roi_image=DestroyImage(roi_image); 11668 11668 (void) SetImageProgressMonitor(*image,progress_monitor, -
ImageMagick/trunk/MagickCore/distort.c
r7275 r7279 1558 1558 exception); 1559 1559 (void) CompositeImage(resize_image,resize_alpha,CopyAlphaCompositeOp, 1560 Magick False,0,0,exception);1560 MagickTrue,0,0,exception); 1561 1561 resize_alpha=DestroyImage(resize_alpha); 1562 1562 } -
ImageMagick/trunk/MagickCore/draw.c
r7274 r7279 4499 4499 else 4500 4500 (void) CompositeImage(image,composite_image,draw_info->compose, 4501 Magick False,geometry.x,geometry.y,exception);4501 MagickTrue,geometry.x,geometry.y,exception); 4502 4502 composite_image=DestroyImage(composite_image); 4503 4503 break; -
ImageMagick/trunk/MagickCore/fx.c
r7274 r7279 4019 4019 picture_image->background_color=image->border_color; 4020 4020 (void) SetImageBackgroundColor(picture_image,exception); 4021 (void) CompositeImage(picture_image,image,OverCompositeOp,Magick False,quantum,4021 (void) CompositeImage(picture_image,image,OverCompositeOp,MagickTrue,quantum, 4022 4022 quantum,exception); 4023 4023 if (caption_image != (Image *) NULL) 4024 4024 { 4025 4025 (void) CompositeImage(picture_image,caption_image,OverCompositeOp, 4026 Magick False,quantum,(ssize_t) (image->rows+3*quantum/2),exception);4026 MagickTrue,quantum,(ssize_t) (image->rows+3*quantum/2),exception); 4027 4027 caption_image=DestroyImage(caption_image); 4028 4028 } … … 4063 4063 polaroid_image=flop_image; 4064 4064 (void) CompositeImage(polaroid_image,picture_image,OverCompositeOp, 4065 Magick False,(ssize_t) (-0.01*picture_image->columns/2.0),0L,exception);4065 MagickTrue,(ssize_t) (-0.01*picture_image->columns/2.0),0L,exception); 4066 4066 picture_image=DestroyImage(picture_image); 4067 4067 (void) QueryColorCompliance("none",AllCompliance, … … 4520 4520 } 4521 4521 (void) CompositeImage(sketch_image,dodge_image,ColorDodgeCompositeOp, 4522 Magick False,0,0,exception);4522 MagickTrue,0,0,exception); 4523 4523 dodge_image=DestroyImage(dodge_image); 4524 4524 blend_image=CloneImage(image,0,0,MagickTrue,exception); … … 4529 4529 } 4530 4530 (void) SetImageArtifact(blend_image,"compose:args","20x80"); 4531 (void) CompositeImage(sketch_image,blend_image,BlendCompositeOp,Magick False,4531 (void) CompositeImage(sketch_image,blend_image,BlendCompositeOp,MagickTrue, 4532 4532 0,0,exception); 4533 4533 blend_image=DestroyImage(blend_image); … … 5523 5523 } 5524 5524 blur_image->matte=MagickFalse; 5525 (void) CompositeImage(canvas_image,blur_image,IntensityCompositeOp, 5526 MagickFalse,0,0,exception);5525 (void) CompositeImage(canvas_image,blur_image,IntensityCompositeOp,MagickTrue, 5526 0,0,exception); 5527 5527 blur_image=DestroyImage(blur_image); 5528 5528 vignette_image=MergeImageLayers(canvas_image,FlattenLayer,exception); -
ImageMagick/trunk/MagickCore/image.c
r7275 r7279 2197 2197 Copy pixel intensity to the alpha channel. 2198 2198 */ 2199 status=CompositeImage(image,image,IntensityCompositeOp,Magick False,0,0,2199 status=CompositeImage(image,image,IntensityCompositeOp,MagickTrue,0,0, 2200 2200 exception); 2201 2201 if (alpha_type == ShapeAlphaChannel) … … 2211 2211 case ExtractAlphaChannel: 2212 2212 { 2213 status=CompositeImage(image,image,AlphaCompositeOp,Magick False,0,0,2213 status=CompositeImage(image,image,AlphaCompositeOp,MagickTrue,0,0, 2214 2214 exception); 2215 2215 image->matte=MagickFalse; … … 3609 3609 y_offset-=geometry.y; 3610 3610 } 3611 status=CompositeImage(smush_image,image,OverCompositeOp,Magick False,3612 x_offset,y_offset,exception);3611 status=CompositeImage(smush_image,image,OverCompositeOp,MagickTrue,x_offset, 3612 y_offset,exception); 3613 3613 proceed=SetImageProgress(image,SmushImageTag,n,number_images); 3614 3614 if (proceed == MagickFalse) -
ImageMagick/trunk/MagickCore/layer.c
r7274 r7279 277 277 */ 278 278 dispose_image=CloneImage(coalesce_image,0,0,MagickTrue,exception); 279 (void) CompositeImage(coalesce_image,next,CopyCompositeOp,Magick False,279 (void) CompositeImage(coalesce_image,next,CopyCompositeOp,MagickTrue, 280 280 next->page.x,next->page.y,exception); 281 281 next=GetNextImageInList(next); … … 329 329 coalesce_image=GetNextImageInList(coalesce_image); 330 330 (void) CompositeImage(coalesce_image,next,next->matte != MagickFalse ? 331 OverCompositeOp : CopyCompositeOp,Magick False,next->page.x,next->page.y,331 OverCompositeOp : CopyCompositeOp,MagickTrue,next->page.x,next->page.y, 332 332 exception); 333 333 (void) CloneImageProfiles(coalesce_image,next); … … 424 424 } 425 425 (void) CompositeImage(current_image,next,next->matte != MagickFalse ? 426 OverCompositeOp : CopyCompositeOp,Magick False,next->page.x,next->page.y,426 OverCompositeOp : CopyCompositeOp,MagickTrue,next->page.x,next->page.y, 427 427 exception); 428 428 /* … … 795 795 image_a->page.x=0; 796 796 image_a->page.y=0; 797 (void) CompositeImage(image_a,next,CopyCompositeOp,Magick False,next->page.x,797 (void) CompositeImage(image_a,next,CopyCompositeOp,MagickTrue,next->page.x, 798 798 next->page.y,exception); 799 799 /* … … 811 811 return((Image *) NULL); 812 812 } 813 (void) CompositeImage(image_a,next,CopyCompositeOp,Magick False,next->page.x,813 (void) CompositeImage(image_a,next,CopyCompositeOp,MagickTrue,next->page.x, 814 814 next->page.y,exception); 815 815 bounds[i]=CompareImagesBounds(image_b,image_a,method,exception); … … 1500 1500 } 1501 1501 (void) CompositeImage(current_image,next,next->matte != MagickFalse ? 1502 OverCompositeOp : CopyCompositeOp,Magick False,next->page.x,next->page.y,1502 OverCompositeOp : CopyCompositeOp,MagickTrue,next->page.x,next->page.y, 1503 1503 exception); 1504 1504 /* … … 1544 1544 if (next != (Image *) NULL) { 1545 1545 (void) CompositeImage(next,dispose_image,ChangeMaskCompositeOp, 1546 Magick False,-(next->page.x),-(next->page.y),exception);1546 MagickTrue,-(next->page.x),-(next->page.y),exception); 1547 1547 } 1548 1548 } … … 1759 1759 x_offset+=source->page.x-destination->page.x; 1760 1760 y_offset+=source->page.y-destination->page.y; 1761 (void) CompositeImage(destination,source,compose,Magick False,x_offset,1761 (void) CompositeImage(destination,source,compose,MagickTrue,x_offset, 1762 1762 y_offset,exception); 1763 1763 } … … 2033 2033 for (scene=0; scene < (ssize_t) number_images; scene++) 2034 2034 { 2035 (void) CompositeImage(canvas,image,image->compose,Magic kFalse,image->page.x-2035 (void) CompositeImage(canvas,image,image->compose,MagicTrue,image->page.x- 2036 2036 canvas->page.x,image->page.y-canvas->page.y,exception); 2037 2037 proceed=SetImageProgress(image,MergeLayersTag,(MagickOffsetType) scene, -
ImageMagick/trunk/MagickCore/montage.c
r7274 r7279 825 825 { 826 826 (void) CompositeImage(shadow_image,image,OverCompositeOp, 827 Magick False,0,0,exception);827 MagickTrue,0,0,exception); 828 828 image=DestroyImage(image); 829 829 image=shadow_image; 830 830 } 831 831 } 832 (void) CompositeImage(montage,image,image->compose,Magick False,832 (void) CompositeImage(montage,image,image->compose,MagickTrue, 833 833 x_offset+x,y_offset+y,exception); 834 834 value=GetImageProperty(image,"label",exception); -
ImageMagick/trunk/MagickCore/morphology.c
r7275 r7279 3878 3878 exception); 3879 3879 (void) CompositeImage(rslt_image,image,CopyAlphaCompositeOp, 3880 Magick False,0,0,exception);3880 MagickTrue,0,0,exception); 3881 3881 (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel, 3882 3882 exception); … … 4105 4105 MagickMorphologyOptions, method) ); 4106 4106 (void) CompositeImage(curr_image,image,DifferenceCompositeOp, 4107 Magick False,0,0,exception);4107 MagickTrue,0,0,exception); 4108 4108 break; 4109 4109 case EdgeMorphology: … … 4113 4113 MagickMorphologyOptions, method) ); 4114 4114 (void) CompositeImage(curr_image,save_image,DifferenceCompositeOp, 4115 Magick False,0,0,exception);4115 MagickTrue,0,0,exception); 4116 4116 save_image = DestroyImage(save_image); /* finished with save image */ 4117 4117 break; … … 4149 4149 (void) FormatLocaleFile(stderr, " (compose \"%s\")", 4150 4150 CommandOptionToMnemonic(MagickComposeOptions, rslt_compose) ); 4151 (void) CompositeImage(rslt_image,curr_image,rslt_compose,Magick False,4151 (void) CompositeImage(rslt_image,curr_image,rslt_compose,MagickTrue, 4152 4152 0,0,exception); 4153 4153 curr_image = DestroyImage(curr_image); -
ImageMagick/trunk/MagickCore/transform.c
r7274 r7279 1084 1084 extent_image->matte=MagickTrue; 1085 1085 (void) SetImageBackgroundColor(extent_image,exception); 1086 (void) CompositeImage(extent_image,image,image->compose,Magick False,1086 (void) CompositeImage(extent_image,image,image->compose,MagickTrue, 1087 1087 -geometry->x,-geometry->y,exception); 1088 1088 return(extent_image); -
ImageMagick/trunk/MagickCore/xwindow.c
r7275 r7279 699 699 (void) CompositeImage(image,annotate_image, 700 700 annotate_image->matte != MagickFalse ? OverCompositeOp : CopyCompositeOp, 701 Magick False,(ssize_t) x,(ssize_t) y,exception);701 MagickTrue,(ssize_t) x,(ssize_t) y,exception); 702 702 image->matte=matte; 703 703 annotate_image=DestroyImage(annotate_image); … … 2636 2636 (void) XParseGeometry(draw_info->geometry,&x,&y,&width,&height); 2637 2637 if (draw_info->stencil == TransparentStencil) 2638 (void) CompositeImage(image,draw_image,CopyAlphaCompositeOp,Magick False,2638 (void) CompositeImage(image,draw_image,CopyAlphaCompositeOp,MagickTrue, 2639 2639 (ssize_t) x,(ssize_t) y,exception); 2640 2640 else 2641 2641 { 2642 2642 matte=image->matte; 2643 (void) CompositeImage(image,draw_image,OverCompositeOp,Magick False,2643 (void) CompositeImage(image,draw_image,OverCompositeOp,MagickTrue, 2644 2644 (ssize_t) x,(ssize_t) y,exception); 2645 2645 image->matte=matte; … … 4524 4524 if (y_offset < 0) 4525 4525 y_offset=0; 4526 (void) CompositeImage(image,composite_image,CopyCompositeOp,Magick False,4526 (void) CompositeImage(image,composite_image,CopyCompositeOp,MagickTrue, 4527 4527 (ssize_t) x_offset,(ssize_t) y_offset,exception); 4528 4528 composite_image=DestroyImage(composite_image); … … 5936 5936 canvas=CloneImage(image,0,0,MagickTrue,exception); 5937 5937 if (canvas != (Image *) NULL) 5938 (void) CompositeImage(canvas,pattern,DstOverCompositeOp,Magick False,5938 (void) CompositeImage(canvas,pattern,DstOverCompositeOp,MagickTrue, 5939 5939 0,0,exception); 5940 5940 pattern=DestroyImage(pattern); -
ImageMagick/trunk/MagickWand/compare.c
r7274 r7279 961 961 { 962 962 (void) CompositeImage(composite_image,reconstruct_image, 963 CopyCompositeOp,Magick False,offset.x,offset.y,exception);963 CopyCompositeOp,MagickTrue,offset.x,offset.y,exception); 964 964 difference_image=CompareImages(image,composite_image,metric, 965 965 &distortion,exception); -
ImageMagick/trunk/MagickWand/composite.c
r7274 r7279 195 195 for (x=0; x < (ssize_t) (*image)->columns; x+=(ssize_t) columns) 196 196 status&=CompositeImage(*image,composite_image, 197 composite_options->compose,Magick False,x,y,exception);197 composite_options->compose,MagickTrue,x,y,exception); 198 198 } 199 199 else … … 217 217 */ 218 218 status&=CompositeImage(*image,composite_image, 219 composite_options->compose,Magick False,geometry.x,geometry.y,219 composite_options->compose,MagickTrue,geometry.x,geometry.y, 220 220 exception); 221 221 } … … 1640 1640 */ 1641 1641 (void) CompositeImage(composite_image,mask_image,CopyGreenCompositeOp, 1642 Magick False,0,0,exception);1642 MagickTrue,0,0,exception); 1643 1643 mask_image=DestroyImage(mask_image); 1644 1644 } -
ImageMagick/trunk/MagickWand/mogrify.c
r7276 r7279 2450 2450 */ 2451 2451 (void) CompositeImage(region_image,*image,region_image->matte != 2452 MagickFalse ? CopyCompositeOp : OverCompositeOp,Magick False,2452 MagickFalse ? CopyCompositeOp : OverCompositeOp,MagickTrue, 2453 2453 region_geometry.x,region_geometry.y,exception); 2454 2454 *image=DestroyImage(*image); … … 3196 3196 (void) SyncImageSettings(mogrify_info,*image,exception); 3197 3197 (void) CompositeImage(region_image,*image,region_image->matte != 3198 MagickFalse ? CopyCompositeOp : OverCompositeOp,Magick False,3198 MagickFalse ? CopyCompositeOp : OverCompositeOp,MagickTrue, 3199 3199 region_geometry.x,region_geometry.y,exception); 3200 3200 *image=DestroyImage(*image); … … 7424 7424 7425 7425 clip_to_self=IsStringTrue(GetImageOption(mogrify_info, 7426 "compose:clip-to-self"));7426 "compose:clip-to-self")); 7427 7427 value=GetImageOption(mogrify_info,"compose:outside-overlay"); 7428 7428 if (value != (const char *) NULL) 7429 7429 clip_to_self=IsFalse(IsStringTrue(value)); 7430 7431 7430 (void) SyncImagesSettings(mogrify_info,*images,exception); 7432 7431 image=RemoveFirstImageFromList(images); … … 7453 7452 */ 7454 7453 (void) CompositeImage(composite_image,mask_image, 7455 CopyGreenCompositeOp,Magick False,0,0,exception);7454 CopyGreenCompositeOp,MagickTrue,0,0,exception); 7456 7455 mask_image=DestroyImage(mask_image); 7457 7456 } … … 7467 7466 } 7468 7467 (void) CompositeImage(image,composite_image,image->compose, 7469 clip_to_self,geometry.x,geometry.y,exception);7468 clip_to_self,geometry.x,geometry.y,exception); 7470 7469 (void) SetImageMask(image,(Image *) NULL,exception); 7471 7470 composite_image=DestroyImage(composite_image); -
ImageMagick/trunk/MagickWand/operation.c
r7278 r7279 3892 3892 { /* Merge Y displacement into X displace/distort map. */ 3893 3893 (void) CompositeImage(source_image,mask_image, 3894 CopyGreenCompositeOp,Magick False,0,0,_exception);3894 CopyGreenCompositeOp,MagickTrue,0,0,_exception); 3895 3895 mask_image=DestroyImage(mask_image); 3896 3896 } -
ImageMagick/trunk/coders/msl.c
r7274 r7279 1916 1916 &exception); 1917 1917 (void) CompositeImage(composite_image, 1918 msl_info->image[j],CopyAlphaCompositeOp,Magick False,1918 msl_info->image[j],CopyAlphaCompositeOp,MagickTrue, 1919 1919 0,0,&exception); 1920 1920 break; … … 2019 2019 if (rotate_image != (Image *) NULL) 2020 2020 (void) CompositeImage(image,rotate_image,compose, 2021 Magick False,x,y,&exception);2021 MagickTrue,x,y,&exception); 2022 2022 else 2023 2023 (void) CompositeImage(image,composite_image, 2024 compose,Magick False,x,y,&exception);2024 compose,MagickTrue,x,y,&exception); 2025 2025 } 2026 2026 if (rotate_image != (Image *) NULL) … … 2073 2073 channel_mask=SetPixelChannelMask(image,channel); 2074 2074 if (rotate_image == (Image *) NULL) 2075 CompositeImage(image,composite_image,compose,Magick False,geometry.x,2075 CompositeImage(image,composite_image,compose,MagickTrue,geometry.x, 2076 2076 geometry.y,&exception); 2077 2077 else … … 2084 2084 geometry.y-=(ssize_t) (rotate_image->rows- 2085 2085 composite_image->rows)/2; 2086 CompositeImage(image,rotate_image,compose,Magick False,geometry.x,2086 CompositeImage(image,rotate_image,compose,MagickTrue,geometry.x, 2087 2087 geometry.y,&exception); 2088 2088 rotate_image=DestroyImage(rotate_image); -
ImageMagick/trunk/coders/pict.c
r7274 r7279 1243 1243 ((bytes_per_line & 0x8000) != 0)) 1244 1244 (void) CompositeImage(image,tile_image,CopyCompositeOp, 1245 Magick False,destination.left,destination.top,exception);1245 MagickTrue,destination.left,destination.top,exception); 1246 1246 tile_image=DestroyImage(tile_image); 1247 1247 break; … … 1389 1389 (void) TransformImageColorspace(image,tile_image->colorspace, 1390 1390 exception); 1391 (void) CompositeImage(image,tile_image,CopyCompositeOp,Magick False,1391 (void) CompositeImage(image,tile_image,CopyCompositeOp,MagickTrue, 1392 1392 frame.left,frame.right,exception); 1393 1393 image->compression=tile_image->compression; -
ImageMagick/trunk/coders/xcf.c
r7274 r7279 684 684 /* composite the tile onto the layer's image, and then destroy it */ 685 685 (void) CompositeImage(inLayerInfo->image,tile_image,CopyCompositeOp, 686 Magick False,destLeft*TILE_WIDTH,destTop*TILE_HEIGHT,exception);686 MagickTrue,destLeft*TILE_WIDTH,destTop*TILE_HEIGHT,exception); 687 687 tile_image=DestroyImage(tile_image); 688 688 … … 1312 1312 */ 1313 1313 (void) CompositeImage(image,layer_info[0].image,OverCompositeOp, 1314 Magick False,layer_info[0].offset_x,layer_info[0].offset_y,exception);1314 MagickTrue,layer_info[0].offset_x,layer_info[0].offset_y,exception); 1315 1315 layer_info[0].image =DestroyImage( layer_info[0].image); 1316 1316 } … … 1325 1325 1326 1326 if ( layer_info[j].visible ) { /* only visible ones, please! */ 1327 CompositeImage(image, OverCompositeOp, layer_info[j].image,1328 layer_info[j].offset_x, layer_info[j].offset_y );1327 CompositeImage(image, layer_info[j].image, OverCompositeOp, 1328 MagickTrue, layer_info[j].offset_x, layer_info[j].offset_y ); 1329 1329 layer_info[j].image =DestroyImage( layer_info[j].image ); 1330 1330 1331 /* Bob says that if we do this, we'll get REAL gray images! */1331 /* If we do this, we'll get REAL gray images! */ 1332 1332 if ( image_type == GIMP_GRAY ) { 1333 1333 QuantizeInfo qi; … … 1346 1346 /* first we copy the last layer on top of the main image */ 1347 1347 (void) CompositeImage(image,layer_info[number_layers-1].image, 1348 CopyCompositeOp,Magick False,layer_info[number_layers-1].offset_x,1348 CopyCompositeOp,MagickTrue,layer_info[number_layers-1].offset_x, 1349 1349 layer_info[number_layers-1].offset_y,exception); 1350 1350 layer_info[number_layers-1].image=DestroyImage(
Note: See TracChangeset
for help on using the changeset viewer.
