Commit a807acfd authored by cristy's avatar cristy

git-svn-id:...

git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/trunk@1583 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74
parent 8ecec28b
......@@ -6,6 +6,7 @@
summed rather attenuating the alpha channel).
* Support writing 1-bit PSD images.
* Support LCMS 2.0.
* Improved WMF support under Windows.
2010-03-30 6.6.1-0 Glenn Randers-Pehrson <glennrp@image...>
* The new coders/png.c was failing to read a 1-bit paletted image properly.
......
......@@ -55,7 +55,7 @@ while test $# -gt 0; do
echo '-L/usr/local/lib '
;;
--libs)
echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
;;
*)
echo "${usage}" 1>&2
......
......@@ -610,6 +610,19 @@ void Magick::Image::colorize ( const unsigned int opacity_,
colorize( opacity_, opacity_, opacity_, penColor_ );
}
// Apply a color matrix to the image channels. The user supplied
// matrix may be of order 1 to 6 (1x1 through 6x6).
void Magick::Image::colorMatrix (const KernelInfo *color_matrix_)
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
MagickCore::Image* newImage =
ColorMatrixImage( image(), color_matrix_, &exceptionInfo );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
// Compare current image with another image
// Sets meanErrorPerPixel, normalizedMaxError, and normalizedMeanError
// in the current image. False is returned if the images are identical.
......@@ -1701,20 +1714,6 @@ void Magick::Image::read ( const unsigned int width_,
(void) DestroyExceptionInfo( &exceptionInfo );
}
// Apply a color matrix to the image channels. The user supplied
// matrix may be of order 1 to 5 (1x1 through 5x5).
void Magick::Image::recolor (const unsigned int order_,
const double *color_matrix_)
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
MagickCore::Image* newImage =
RecolorImage( image(), order_, color_matrix_, &exceptionInfo );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
// Reduce noise in image
void Magick::Image::reduceNoise ( const double order_ )
{
......
......@@ -766,6 +766,7 @@ namespace Magick
using MagickCore::IsEventLogging;
using MagickCore::IsGeometry;
using MagickCore::IsImagesEqual;
using MagickCore::KernelInfo;
using MagickCore::LessValue;
using MagickCore::LevelImage;
using MagickCore::LevelImageChannel;
......
......@@ -1150,8 +1150,7 @@ coders_wbmp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$@
@WITH_MODULES_TRUE@am_coders_wbmp_la_rpath = -rpath $(codersdir)
coders_wmf_la_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_coders_wmf_la_OBJECTS = coders/coders_wmf_la-wmf.lo
coders_wmf_la_OBJECTS = $(am_coders_wmf_la_OBJECTS)
coders_wmf_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
......@@ -2449,7 +2448,6 @@ UMEM_LIBS = @UMEM_LIBS@
VERSION = @VERSION@
WMFDecodeDelegate = @WMFDecodeDelegate@
WMF_LIBS = @WMF_LIBS@
WMF_LIBS_DEPS = @WMF_LIBS_DEPS@
WWWDecodeDelegate = @WWWDecodeDelegate@
WinPathScript = @WinPathScript@
X11_LIBS = @X11_LIBS@
......
......@@ -9961,37 +9961,6 @@ Mogrify(ref,...)
(void) LinearStretchImage(image,black_point,white_point);
break;
}
case 108: /* Recolor */
{
AV
*av;
double
*color_matrix;
unsigned long
order;
if (attribute_flag[0] == 0)
break;
av=(AV *) argument_list[0].array_reference;
order=(unsigned long) sqrt(av_len(av)+1);
color_matrix=(double *) AcquireQuantumMemory(order,order*
sizeof(*color_matrix));
if (color_matrix == (double *) NULL)
{
ThrowPerlException(exception,ResourceLimitFatalError,
"MemoryAllocationFailed",PackageName);
goto PerlException;
}
for (j=0; (j < (long) (order*order)) && (j < (av_len(av)+1)); j++)
color_matrix[j]=(double) SvNV(*(av_fetch(av,j,0)));
for ( ; j < (long) (order*order); j++)
color_matrix[j]=0.0;
image=RecolorImage(image,order,color_matrix,exception);
color_matrix=(double *) RelinquishMagickMemory(color_matrix);
break;
}
case 109: /* Mask */
{
if (attribute_flag[0] == 0)
......@@ -10485,6 +10454,7 @@ Mogrify(ref,...)
kernel=DestroyKernelInfo(kernel);
break;
}
case 108: /* Recolor */
case 134: /* ColorMatrix */
{
KernelInfo
......@@ -10496,7 +10466,7 @@ Mogrify(ref,...)
if (color_matrix == (KernelInfo *) NULL)
break;
image=ColorMatrixImage(image,color_matrix,exception);
kernel=DestroyKernelInfo(kernel);
color_matrix=DestroyKernelInfo(color_matrix);
break;
}
}
......
......@@ -2998,7 +2998,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
quantum=1;
else
quantum=8;
if (datum != ~0U)
if (datum != ~0)
length=(size_t) datum/quantum;
else
{
......
......@@ -1653,7 +1653,7 @@ static void WriteOneChannel(const PSDInfo *psd_info,const ImageInfo *image_info,
length=ExportQuantumPixels(tmp_image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
if (monochrome != MagickFalse)
for (i=0; i < length; i++)
for (i=0; i < (long) length; i++)
pixels[i]=(~pixels[i]);
if (tmp_image->compression != RLECompression)
(void) WriteBlob(image,length,pixels);
......
This diff is collapsed.
......@@ -853,10 +853,7 @@
/* Define if using the dmalloc debugging malloc package */
#undef WITH_DMALLOC
/* Define if you have wmflite library */
#undef WMFLITE_DELEGATE
/* Define if you have wmf library */
/* Define if you have WMF library */
#undef WMF_DELEGATE
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
......
......@@ -9,7 +9,7 @@
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x661"/>
<configure name="LIB_VERSION_NUMBER" value="6,6,1,0"/>
<configure name="RELEASE_DATE" value="2010-03-26"/>
<configure name="RELEASE_DATE" value="2010-04-02"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
......@@ -20,7 +20,7 @@
<configure name="PCFLAGS" value="-fopenmp"/>
<configure name="DEFS" value="-DHAVE_CONFIG_H"/>
<configure name="LDFLAGS" value="-L/usr/local/lib "/>
<configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
<configure name="LIBS" value="-lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
<configure name="CXX" value="g++"/>
<configure name="CXXFLAGS" value="-g -O2 -Wall -W -pthread"/>
<configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath="/>
......
This diff is collapsed.
......@@ -2426,56 +2426,35 @@ fi
have_wmf='no'
WMF_LIBS=''
WMF_LIBS_DEPS=''
OLIBS="$LIBS"
if test "$with_wmf" != 'no'; then
AC_MSG_RESULT([-------------------------------------------------------------])
AC_MSG_CHECKING([for WMF])
AC_MSG_RESULT([])
have_libwmf='no'
have_libwmflite='no'
have_libwmf_ipa_h='no'
AC_CHECK_HEADER([libwmf/ipa.h],[have_libwmf_ipa_h='yes'],,[$FT2BUILD_H])
if test "$have_libwmf_ipa_h" = 'yes'; then
AC_CHECK_LIB(wmflite,wmf_lite_create,have_libwmflite='yes',,)
if test "$have_libwmflite" = 'yes'; then
AC_DEFINE(WMFLITE_DELEGATE,1,Define if you have wmflite library)
WMF_LIBS='-lwmflite'
failed=0
passed=0
AC_CHECK_HEADER(libwmf/eps.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_CHECK_LIB(wmf,wmf_eps_function,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
AC_MSG_CHECKING([if WMF package is complete])
if test $passed -gt 0; then
if test $failed -gt 0; then
AC_MSG_RESULT([no -- some components failed test])
have_wmf='no (failed tests)'
else
WMF_LIBS='-lwmf -lwmflite'
LIBS="$WMF_LIBS $LIBS"
AC_DEFINE(WMF_DELEGATE,1,Define if you have WMF library)
AC_MSG_RESULT([yes])
have_wmf='yes'
else
WMF_LIBS_DEPS=''
WMF_CONFIG_LIBS=`libwmf-config --libs`
for lib in xml2 expat freetype jpeg png z; do
testlib="-l${lib}"
echo "$WMF_CONFIG_LIBS" | grep -- "$testlib" > /dev/null && WMF_LIBS_DEPS="$WMF_LIBS_DEPS $testlib"
done
AC_CHECK_LIB(wmf,wmf_api_create,have_libwmf='yes',,$WMF_LIBS_DEPS)
if test "$have_libwmf" = 'yes'; then
AC_DEFINE(WMF_DELEGATE,1,Define if you have wmf library)
WMF_LIBS='-lwmf'
LIBS="$WMF_LIBS $LIBS"
have_wmf='yes'
else
AC_MSG_RESULT([no -- some components failed test])
have_wmf='no (failed tests)'
have_wmflite='no (failed tests)'
LIBS="$OLIBS"
WMF_LIBS=''
fi
fi
fi
AC_MSG_CHECKING([if WMF package is complete])
if test "$have_wmf" = 'yes'; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi
AM_CONDITIONAL(WMF_DELEGATE, test "$have_wmf" = 'yes')
AM_CONDITIONAL(WMF_DELEGATE,test "$have_wmf" = 'yes')
AC_SUBST(WMF_LIBS)
AC_SUBST(WMF_LIBS_DEPS)
dnl ===========================================================================
dnl ===========================================================================
......
......@@ -243,7 +243,7 @@ hardcode_into_libs=yes
sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.4.3 /usr/lib64 /lib64"
# Run-time system search path for libraries.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/alliance/lib /usr/lib64/atlas /usr/lib64/kicad /usr/lib64/mysql /usr/lib64/octave-3.2.4 /usr/lib64/openmotif /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/wine/ /usr/lib64/xulrunner-1.9.2 "
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/alliance/lib /usr/lib64/atlas /usr/lib64/kicad /usr/lib64/llvm /usr/lib64/mysql /usr/lib64/octave-3.2.4 /usr/lib64/openmotif /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib64/wine/ /usr/lib64/xulrunner-1.9.2 "
# Whether dlopen is supported.
dlopen_support=yes
......
......@@ -52,7 +52,7 @@ while test $# -gt 0; do
echo '-L/usr/local/lib '
;;
--libs)
echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
echo "-L${libdir} -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
;;
*)
echo "${usage}" 1>&2
......
......@@ -1043,7 +1043,7 @@
/* Define to the system default library search path. */
#ifndef MAGICKCORE_LT_DLSEARCH_PATH
#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/usr/lib64/kicad:/usr/lib64/mysql:/usr/lib64/octave-3.2.4:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/wine/:/usr/lib64/xulrunner-1.9.2"
#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/usr/lib64/kicad:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/octave-3.2.4:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/wine/:/usr/lib64/xulrunner-1.9.2"
#endif
/* The archive extension */
......@@ -1278,14 +1278,11 @@
/* Define if using the dmalloc debugging malloc package */
/* #undef WITH_DMALLOC */
/* Define if you have wmflite library */
#ifndef MAGICKCORE_WMFLITE_DELEGATE
#define MAGICKCORE_WMFLITE_DELEGATE 1
/* Define if you have WMF library */
#ifndef MAGICKCORE_WMF_DELEGATE
#define MAGICKCORE_WMF_DELEGATE 1
#endif
/* Define if you have wmf library */
/* #undef WMF_DELEGATE */
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#if defined AC_APPLE_UNIVERSAL_BUILD
......
......@@ -33,8 +33,8 @@ extern "C" {
#define MagickLibAddendum "-0"
#define MagickLibInterface 3
#define MagickLibMinInterface 3
#define MagickReleaseDate "2010-03-26"
#define MagickChangeDate "20100321"
#define MagickReleaseDate "2010-04-02"
#define MagickChangeDate "20100331"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.1/index.html"
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
......
......@@ -34,6 +34,7 @@ Image Settings:
\-delay value display the next image after pausing
\-density geometry horizontal and vertical density of the image
\-depth value image depth
\-direction type render text right-to-left or left-to-right
\-display server get image or font from this X server
\-dispose method layer disposal method
\-dither method apply error diffusion to image
......@@ -114,6 +115,7 @@ Image Operators:
\-clip-mask filename associate a clip mask with the image
\-clip-path id clip along a named path from the 8BIM profile
\-colorize value colorize the image with the fill color
\-color-matrix matrix apply color correction to the image
\-contrast enhance or reduce the image contrast
\-contrast-stretch geometry
improve contrast by `stretching' the intensity range
......@@ -172,7 +174,6 @@ Image Operators:
\-raise value lighten/darken image edges to create a 3-D effect
\-random-threshold low,high
random threshold the image
\-recolor matrix apply color correction to the image
\-region geometry apply options to a portion of the image
\-render render vector graphics
\-repage geometry size and location of an image canvas
......
......@@ -34,6 +34,7 @@ Image Settings:
\-delay value display the next image after pausing
\-density geometry horizontal and vertical density of the image
\-depth value image depth
\-direction type render text right-to-left or left-to-right
\-display server get image or font from this X server
\-dispose method layer disposal method
\-dither method apply error diffusion to image
......@@ -118,6 +119,7 @@ Image Operators:
\-clip-mask filename associate a clip mask with the image
\-clip-path id clip along a named path from the 8BIM profile
\-colorize value colorize the image with the fill color
\-color-matrix matrix apply color correction to the image
\-contrast enhance or reduce the image contrast
\-contrast-stretch geometry
improve contrast by `stretching' the intensity range
......@@ -174,7 +176,6 @@ Image Operators:
\-raise value lighten/darken image edges to create a 3-D effect
\-random-threshold low,high
random threshold the image
\-recolor matrix apply color correction to the image
\-region geometry apply options to a portion of the image
\-render render vector graphics
\-repage geometry size and location of an image canvas
......
......@@ -52,7 +52,7 @@ while test $# -gt 0; do
echo '-L/usr/local/lib '
;;
--libs)
echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
echo "-L${libdir} -lMagickWand -lMagickCore -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -ldjvulibre -lfftw3 -lfontconfig -lwmf -lwmflite -lXext -lXt -lSM -lICE -lX11 -lbz2 -pthread -lrsvg-2 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
;;
*)
echo "${usage}" 1>&2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment