Changeset 15

Show
Ignore:
Timestamp:
09/08/09 07:37:22 (6 months ago)
Author:
cristy
Message:
 
Files:
9 modified

Legend:

Unmodified
Added
Removed
  • ImageMagick/trunk/ImageMagick.spec

    r14 r15  
    11%define VERSION  6.5.5 
    2 %define Patchlevel  9 
     2%define Patchlevel  8 
    33 
    44Name:           ImageMagick 
  • ImageMagick/trunk/coders/pdf.c

    r9 r15  
    566566       delegate_info=GetDelegateInfo("ps:cmyk",(char *) NULL,exception); 
    567567     else 
    568 #if defined(MAGICKCORE_PNG_DELEGATE) 
    569        delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception); 
    570 #else 
    571        delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception); 
    572 #endif 
     568       if (LocaleCompare(image_info->magick,"AI") == 0) 
     569         delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception); 
     570       else 
     571         delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception); 
    573572  if (delegate_info == (const DelegateInfo *) NULL) 
    574573    { 
  • ImageMagick/trunk/coders/ps.c

    r9 r15  
    699699      delegate_info=GetDelegateInfo("ps:cmyk",(char *) NULL,exception); 
    700700    else 
    701 #if defined(MAGICKCORE_PNG_DELEGATE) 
    702       delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception); 
    703 #else 
    704       delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception); 
    705 #endif 
     701      if (pages == 1) 
     702        delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception); 
     703      else 
     704        delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception); 
    706705  if (delegate_info == (const DelegateInfo *) NULL) 
    707706    { 
  • ImageMagick/trunk/config/configure.xml

    r14 r15  
    99  <configure name="NAME" value="ImageMagick"/> 
    1010  <configure name="LIB_VERSION" value="0x655"/> 
    11   <configure name="LIB_VERSION_NUMBER" value="6,5,5,9"/> 
     11  <configure name="LIB_VERSION_NUMBER" value="6,5,5,8"/> 
    1212  <configure name="RELEASE_DATE" value="2009-09-08"/> 
    1313  <configure name="CONFIGURE" value="./configure "/> 
  • ImageMagick/trunk/libtool

    r14 r15  
    22 
    33# libtool - Provide generalized library-building support services. 
    4 # Generated automatically by config.status (ImageMagick) 6.5.5-9 
     4# Generated automatically by config.status (ImageMagick) 6.5.5-8 
    55# Libtool was configured on host magick.imagemagick.org: 
    66# NOTE: Changes made to this file will be lost: look at ltmain.sh. 
  • ImageMagick/trunk/magick/version.h

    r14 r15  
    3131#define MagickLibVersionText  "6.5.5" 
    3232#define MagickLibVersionNumber  2,0,0 
    33 #define MagickLibSubversion  "-9" 
     33#define MagickLibSubversion  "-8" 
    3434#define MagickReleaseDate  "2009-09-08" 
    3535#define MagickChangeDate   "20090907" 
  • ImageMagick/trunk/version.sh

    r13 r15  
    1313PACKAGE_VERSION='6.5.5' 
    1414PACKAGE_LIB_VERSION="0x655" 
    15 PACKAGE_RELEASE="9" 
     15PACKAGE_RELEASE="8" 
    1616PACKAGE_LIB_VERSION_NUMBER="6,5,5,${PACKAGE_RELEASE}" 
    1717PACKAGE_RELEASE_DATE=`date +%F` 
  • VisualMagick/trunk/bin/configure.xml

    r13 r15  
    99  <configure name="NAME" value="ImageMagick"/> 
    1010  <configure name="LIB_VERSION" value="0x655"/> 
    11   <configure name="LIB_VERSION_NUMBER" value="6,5,5,9"/> 
     11  <configure name="LIB_VERSION_NUMBER" value="6,5,5,8"/> 
    1212  <configure name="RELEASE_DATE" value="2009-09-15"/> 
    1313  <configure name="VERSION" value="6.5.5"/> 
  • VisualMagick/trunk/installer/inc/version.isx

    r13 r15  
    1919#define public MagickPackageName "ImageMagick" 
    2020#define public MagickPackageVersion "6.5.5" 
    21 #define public MagickPackageVersionAddendum "-9" 
     21#define public MagickPackageVersionAddendum "-8" 
    2222#define public MagickPackageReleaseDate "2009-09-15"