Skip to content

Commit 4c08aed

Browse files
author
cristy
committed
1 parent 54dc069 commit 4c08aed

File tree

464 files changed

+25589
-37578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

464 files changed

+25589
-37578
lines changed

‎Install-vms.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ VMS COMPILATION
66

77
Type
88

9-
unzip ImageMagick-6.7.1-0.zip
9+
unzip ImageMagick-7.0.0-0.zip
1010
set default [.imagemagick]
1111
@make
1212
set display/create/node=node_name::

‎Install-windows.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ Create a Self-Installing Binary Distribution
345345

346346
Install the Binary Distribution
347347

348-
1. Double-click on VisualMagick/bin/ImageMagick-6.7.1-0-Q16-windows-dll.exe
348+
1. Double-click on VisualMagick/bin/ImageMagick-7.0.0-0-Q16-windows-dll.exe
349349
to launch the ImageMagick binary distribution.
350350
2. Complete the installer screens to install ImageMagick on your system.
351351

‎Magick++/Makefile.am

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ MAGICKPP_MANS = $(MAGICKPP_MANS_OPT)
1313
MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT)
1414
MAGICKPP_SCRPTS = $(MAGICKPP_SCRIPTS_OPT)
1515
MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRIPTS_OPT)
16-
MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT)
1716
MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT)
1817
else
1918
MAGICKPP_LIBS =
@@ -22,7 +21,6 @@ MAGICKPP_MANS =
2221
MAGICKPP_PKGCONFIG =
2322
MAGICKPP_SCRPTS =
2423
MAGICKPP_TESTS =
25-
MAGICKPP_TOP_INCHEADERS =
2624
MAGICKPP_INCHEADERS =
2725
endif
2826

@@ -137,16 +135,14 @@ Magick___lib_libMagick___la_SOURCES = \
137135
Magick++/lib/Magick++/TypeMetric.h
138136

139137
magickpptopincdir = $(topincludedir)
140-
magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
141-
142-
MAGICKPP_TOP_INCHEADERS_OPT = \
143-
Magick++/lib/Magick++.h
138+
magickpptopinc_HEADERS =
144139

145140
magickppincdir = $(topincludedir)/Magick++
146141

147142
magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
148143

149144
MAGICKPP_INCHEADERS_OPT = \
145+
Magick++/lib/Magick++.h
150146
Magick++/lib/Magick++/Blob.h \
151147
Magick++/lib/Magick++/CoderInfo.h \
152148
Magick++/lib/Magick++/Color.h \

‎Magick++/lib/Color.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Magick::Color::Color ( Quantum red_,
8585
redQuantum ( red_ );
8686
greenQuantum ( green_ );
8787
blueQuantum ( blue_ );
88-
alphaQuantum ( OpaqueOpacity );
88+
alphaQuantum ( OpaqueAlpha );
8989
}
9090

9191
// Construct from RGBA
@@ -149,7 +149,7 @@ Magick::Color::Color ( const PixelPacket &color_ )
149149
{
150150
*_pixel = color_;
151151

152-
if ( color_.opacity != OpaqueOpacity )
152+
if ( color_.alpha != OpaqueAlpha )
153153
_pixelType = RGBAPixel;
154154
}
155155

@@ -201,9 +201,9 @@ const Magick::Color& Magick::Color::operator = ( const std::string &x11color_ )
201201
redQuantum( target_color.red );
202202
greenQuantum( target_color.green );
203203
blueQuantum( target_color.blue );
204-
alphaQuantum( target_color.opacity );
204+
alphaQuantum( target_color.alpha );
205205

206-
if ( target_color.opacity > OpaqueOpacity )
206+
if ( target_color.alpha != OpaqueAlpha )
207207
_pixelType = RGBAPixel;
208208
else
209209
_pixelType = RGBPixel;
@@ -233,7 +233,7 @@ Magick::Color::operator std::string() const
233233

234234
char colorbuf[MaxTextExtent];
235235

236-
MagickPixelPacket
236+
PixelInfo
237237
pixel;
238238

239239
pixel.colorspace=RGBColorspace;
@@ -242,7 +242,7 @@ Magick::Color::operator std::string() const
242242
pixel.red=_pixel->red;
243243
pixel.green=_pixel->green;
244244
pixel.blue=_pixel->blue;
245-
pixel.opacity=_pixel->opacity;
245+
pixel.alpha=_pixel->alpha;
246246
GetColorTuple( &pixel, MagickTrue, colorbuf );
247247

248248
return std::string(colorbuf);
@@ -252,7 +252,7 @@ Magick::Color::operator std::string() const
252252
const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelPacket &color_ )
253253
{
254254
*_pixel = color_;
255-
if ( color_.opacity != OpaqueOpacity )
255+
if ( color_.alpha != OpaqueAlpha )
256256
_pixelType = RGBAPixel;
257257
else
258258
_pixelType = RGBPixel;
@@ -313,7 +313,7 @@ Magick::ColorHSL::ColorHSL ( double hue_,
313313
redQuantum ( red );
314314
greenQuantum ( green );
315315
blueQuantum ( blue );
316-
alphaQuantum ( OpaqueOpacity );
316+
alphaQuantum ( OpaqueAlpha );
317317
}
318318

319319
// Null constructor
@@ -463,7 +463,7 @@ Magick::ColorGray::ColorGray ( double shade_ )
463463
scaleDoubleToQuantum( shade_ ),
464464
scaleDoubleToQuantum( shade_ ) )
465465
{
466-
alphaQuantum ( OpaqueOpacity );
466+
alphaQuantum ( OpaqueAlpha );
467467
}
468468

469469
// Null constructor
@@ -512,7 +512,7 @@ Magick::ColorMono::ColorMono ( bool mono_ )
512512
( mono_ ? QuantumRange : 0 ),
513513
( mono_ ? QuantumRange : 0 ) )
514514
{
515-
alphaQuantum ( OpaqueOpacity );
515+
alphaQuantum ( OpaqueAlpha );
516516
}
517517

518518
// Null constructor
@@ -567,7 +567,7 @@ Magick::ColorRGB::ColorRGB ( double red_,
567567
scaleDoubleToQuantum(green_),
568568
scaleDoubleToQuantum(blue_) )
569569
{
570-
alphaQuantum ( OpaqueOpacity );
570+
alphaQuantum ( OpaqueAlpha );
571571
}
572572
// Null constructor
573573
Magick::ColorRGB::ColorRGB ( void )
@@ -619,7 +619,7 @@ Magick::ColorYUV::ColorYUV ( double y_,
619619
scaleDoubleToQuantum(y_ - (0.39380 * u_) - (0.58050 * v_) ),
620620
scaleDoubleToQuantum(y_ + 2.02790 * u_ ) )
621621
{
622-
alphaQuantum ( OpaqueOpacity );
622+
alphaQuantum ( OpaqueAlpha );
623623
}
624624
// Null constructor
625625
Magick::ColorYUV::ColorYUV ( void )

‎Magick++/lib/Drawable.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
1010
#define MAGICK_DRAWABLE_IMPLEMENTATION
1111

12-
#include "Magick++/Include.h"
1312
#include <math.h>
1413
#include <string>
14+
#include "Magick++/Include.h"
1515

1616
#include "Magick++/Drawable.h"
1717
#include "Magick++/Image.h"
@@ -585,7 +585,7 @@ void Magick::DrawableFillColor::operator()
585585
{
586586
PixelPacket color = static_cast<PixelPacket>(_color);
587587
PixelWand *pixel_wand=NewPixelWand();
588-
PixelSetQuantumColor(pixel_wand,&color);
588+
PixelSetQuantumPacket(pixel_wand,&color);
589589
DrawSetFillColor(context_,pixel_wand);
590590
pixel_wand=DestroyPixelWand(pixel_wand);
591591
}
@@ -608,14 +608,14 @@ Magick::DrawableBase* Magick::DrawableFillRule::copy() const
608608
return new DrawableFillRule(*this);
609609
}
610610

611-
// Specify drawing fill opacity
611+
// Specify drawing fill alpha
612612
Magick::DrawableFillOpacity::~DrawableFillOpacity ( void )
613613
{
614614
}
615615
void Magick::DrawableFillOpacity::operator()
616616
( MagickCore::DrawingWand * context_ ) const
617617
{
618-
DrawSetFillOpacity( context_, _opacity );
618+
DrawSetFillOpacity( context_, _alpha );
619619
}
620620
Magick::DrawableBase* Magick::DrawableFillOpacity::copy() const
621621
{
@@ -1212,7 +1212,7 @@ void Magick::DrawableStrokeColor::operator()
12121212
{
12131213
PixelPacket color = static_cast<PixelPacket>(_color);
12141214
PixelWand *pixel_wand=NewPixelWand();
1215-
PixelSetQuantumColor(pixel_wand,&color);
1215+
PixelSetQuantumPacket(pixel_wand,&color);
12161216
DrawSetStrokeColor(context_,pixel_wand);
12171217
pixel_wand=DestroyPixelWand(pixel_wand);
12181218
}
@@ -1221,14 +1221,14 @@ Magick::DrawableBase* Magick::DrawableStrokeColor::copy() const
12211221
return new DrawableStrokeColor(*this);
12221222
}
12231223

1224-
// Stroke opacity
1224+
// Stroke alpha
12251225
Magick::DrawableStrokeOpacity::~DrawableStrokeOpacity ( void )
12261226
{
12271227
}
12281228
void Magick::DrawableStrokeOpacity::operator()
12291229
( MagickCore::DrawingWand * context_ ) const
12301230
{
1231-
DrawSetStrokeOpacity( context_, _opacity );
1231+
DrawSetStrokeOpacity( context_, _alpha );
12321232
}
12331233
Magick::DrawableBase* Magick::DrawableStrokeOpacity::copy() const
12341234
{
@@ -1358,7 +1358,7 @@ void Magick::DrawableTextUnderColor::operator()
13581358
{
13591359
PixelPacket color = static_cast<PixelPacket>(_color);
13601360
PixelWand *pixel_wand=NewPixelWand();
1361-
PixelSetQuantumColor(pixel_wand,&color);
1361+
PixelSetQuantumPacket(pixel_wand,&color);
13621362
DrawSetTextUnderColor(context_,pixel_wand);
13631363
pixel_wand=DestroyPixelWand(pixel_wand);
13641364
}

0 commit comments

Comments
 (0)