averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-31 11:18:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
cristy
2012-01-19 18:32:39 +00:00
parent e1b872a835
commit fad60c95ff
8 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Magick++/lib/Magick++/Options.h
+4
View File
@@ -259,6 +259,10 @@ namespace Magick
void view ( const std::string &view_ );
std::string view ( void ) const;
// Virtual pixel method.
void virtualPixelMethod ( VirtualPixelMethod virtual_pixel_method_ );
VirtualPixelMethod virtualPixelMethod ( void ) const;
// X11 display name
void x11Display ( const std::string &display_ );
std::string x11Display ( void ) const;
Magick++/lib/Options.cpp
+9
View File
@@ -792,6 +792,15 @@ bool Magick::Options::verbose ( void ) const
return static_cast<bool>(_imageInfo->verbose);
}
void Magick::Options::virtualPixelMethod ( VirtualPixelMethod virtual_pixel_method_ )
{
_imageInfo->virtual_pixel_method = virtual_pixel_method_;
}
Magick::VirtualPixelMethod Magick::Options::virtualPixelMethod ( void ) const
{
return static_cast<Magick::VirtualPixelMethod>(_imageInfo->virtual_pixel_method);
}
void Magick::Options::view ( const std::string &view_ )
{
if ( view_.length() == 0 )
MagickCore/draw.c
+5 -5
View File
@@ -1270,7 +1270,7 @@ static void DrawBoundingRectangles(Image *image,const DrawInfo *draw_info,
coordinates;
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
(void) QueryColorCompliance("#000F",AllCompliance,&clone_info->fill,
(void) QueryColorCompliance("#0000",AllCompliance,&clone_info->fill,
exception);
resolution.x=DefaultResolution;
resolution.y=DefaultResolution;
@@ -1420,7 +1420,7 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
(void) SetImageClipMask(image,clip_mask,exception);
clip_mask=DestroyImage(clip_mask);
}
(void) QueryColorCompliance("#000F",AllCompliance,
(void) QueryColorCompliance("#0000",AllCompliance,
&image->clip_mask->background_color,exception);
image->clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(image->clip_mask,exception);
@@ -3495,7 +3495,7 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image,
image_info->size=AcquireString(geometry);
*pattern=AcquireImage(image_info,exception);
image_info=DestroyImageInfo(image_info);
(void) QueryColorCompliance("#000000FF",AllCompliance,
(void) QueryColorCompliance("#00000000",AllCompliance,
&(*pattern)->background_color,exception);
(void) SetImageBackgroundColor(*pattern,exception);
if (image->debug != MagickFalse)
@@ -4755,9 +4755,9 @@ MagickExport void GetDrawInfo(const ImageInfo *image_info,DrawInfo *draw_info)
(void) ResetMagickMemory(draw_info,0,sizeof(*draw_info));
GetAffineMatrix(&draw_info->affine);
exception=AcquireExceptionInfo();
(void) QueryColorCompliance("#0000",AllCompliance,&draw_info->fill,
(void) QueryColorCompliance("#000F",AllCompliance,&draw_info->fill,
exception);
(void) QueryColorCompliance("#FFFF",AllCompliance,&draw_info->stroke,
(void) QueryColorCompliance("#FFF0",AllCompliance,&draw_info->stroke,
exception);
draw_info->stroke_width=1.0;
draw_info->alpha=OpaqueAlpha;
MagickCore/resize.c
+9 -6
View File
@@ -1159,8 +1159,12 @@ MagickPrivate ResizeFilter *AcquireResizeFilter(const Image *image,
MagickExport Image *AdaptiveResizeImage(const Image *image,
const size_t columns,const size_t rows, ExceptionInfo *exception)
{
return(InterpolativeResizeImage(image,columns,rows,MeshInterpolatePixel,
exception));
Image
*resize_image;
resize_image=InterpolativeResizeImage(image,columns,rows,MeshInterpolatePixel,
exception);
return(resize_image);
}
/*
@@ -1572,9 +1576,8 @@ MagickExport Image *InterpolativeResizeImage(const Image *image,
progress=0;
image_view=AcquireCacheView(image);
resize_view=AcquireCacheView(resize_image);
scale.x=(MagickRealType)image->columns/resize_image->columns;
scale.y=(MagickRealType)image->rows/resize_image->rows;
scale.x=(double) image->columns/resize_image->columns;
scale.y=(double) image->rows/resize_image->rows;
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(static,1) shared(progress,status)
#endif
@@ -1600,7 +1603,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image,
{
offset.x=((MagickRealType) x+0.5)*scale.x-0.5;
status=InterpolatePixelChannels(image,image_view,resize_image,method,
offset.x,offset.y,q,exception);
offset.x,offset.y,q,exception);
q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
MagickCore/version.h
+1 -1
View File
@@ -34,7 +34,7 @@ extern "C" {
#define MagickLibAddendum "-0"
#define MagickLibInterface 7
#define MagickLibMinInterface 7
#define MagickReleaseDate "2012-01-18"
#define MagickReleaseDate "2012-01-19"
#define MagickChangeDate "20110801"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
coders/histogram.c
+2 -3
View File
@@ -292,13 +292,12 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
/*
Initialize histogram image.
*/
(void) QueryColorCompliance("#000",AllCompliance,
(void) QueryColorCompliance("#000000",AllCompliance,
&histogram_image->background_color,exception);
(void) SetImageBackgroundColor(histogram_image,exception);
for (x=0; x < (ssize_t) histogram_image->columns; x++)
{
q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,
exception);
q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);
if (q == (Quantum *) NULL)
break;
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
coders/svg.c
+13 -13
View File
@@ -1657,15 +1657,15 @@ static void SVGStartElement(void *context,const xmlChar *name,
if (LocaleCompare(value,"currentColor") == 0)
{
(void) FormatLocaleFile(svg_info->file,
"fill '%s'\n",color);
"fill '%s'\n",color);
break;
}
if (LocaleCompare(value,"#000000FF") == 0)
if (LocaleCompare(value,"#00000000") == 0)
(void) FormatLocaleFile(svg_info->file,
"fill '#000000'\n");
"fill '#000000'\n");
else
(void) FormatLocaleFile(svg_info->file,"fill '%s'\n",
value);
value);
break;
}
if (LocaleCompare(keyword,"fillcolor") == 0)
@@ -1747,18 +1747,18 @@ static void SVGStartElement(void *context,const xmlChar *name,
}
if (LocaleCompare(keyword,"stroke") == 0)
{
if (LocaleCompare(value,"currentColor") == 0)
{
(void) FormatLocaleFile(svg_info->file,
"stroke '%s'\n",color);
break;
}
if (LocaleCompare(value,"#000000FF") == 0)
if (LocaleCompare(value,"currentColor") == 0)
{
(void) FormatLocaleFile(svg_info->file,
"stroke '%s'\n",color);
break;
}
if (LocaleCompare(value,"#00000000") == 0)
(void) FormatLocaleFile(svg_info->file,
"fill '#000000'\n");
"fill '#000000'\n");
else
(void) FormatLocaleFile(svg_info->file,
"stroke '%s'\n",value);
"stroke '%s'\n",value);
break;
}
if (LocaleCompare(keyword,"stroke-antialiasing") == 0)
config/configure.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<configure name="LIB_VERSION" value="0x700"/>
<configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
<configure name="SVN_REVISION" value="6505" />
<configure name="RELEASE_DATE" value="2012-01-18"/>
<configure name="RELEASE_DATE" value="2012-01-19"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>