From: cristy Date: Sun, 7 Mar 2010 21:47:41 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9841 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7959f82310c4ff55f8c91f7b477e8ca1e49f8544;hp=63fed270c402a8127899cee58faa69f85f5443fa;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index 27e3ba8b6..742f24150 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.0 -%define Patchlevel 5 +%define Patchlevel 4 Name: ImageMagick Version: %{VERSION} diff --git a/coders/dpx.c b/coders/dpx.c index 5473066c4..8d22f63cd 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -1575,10 +1575,12 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) dpx.orientation.timestamp); value=GetDPXProperty(image_info,image,"dpx:orientation.device"); if (value != (const char *) NULL) - (void) strncpy(dpx.orientation.device,value, - sizeof(dpx.orientation.device)); + (void) strncpy(dpx.orientation.device,value,sizeof(dpx.orientation.device)); offset+=WriteBlob(image,sizeof(dpx.orientation.device),(unsigned char *) dpx.orientation.device); + value=GetDPXProperty(image_info,image,"dpx:orientation.serial"); + if (value != (const char *) NULL) + (void) strncpy(dpx.orientation.serial,value,sizeof(dpx.orientation.serial)); offset+=WriteBlob(image,sizeof(dpx.orientation.serial),(unsigned char *) dpx.orientation.serial); for (i=0; i < 4; i++) diff --git a/config/configure.xml b/config/configure.xml index bce154a12..95766b887 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index d3ee42c90..eaf8b4fda 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.0-5 +# Generated automatically by config.status (ImageMagick) 6.6.0-4 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/splay-tree.c b/magick/splay-tree.c index 125f3f16a..3b22b8ccf 100644 --- a/magick/splay-tree.c +++ b/magick/splay-tree.c @@ -325,9 +325,27 @@ static void BalanceSplayTree(SplayTreeInfo *splay_tree) % whenever a value object is added to the splay-tree. % */ + +static void *GetFirstSplayTreeNode(SplayTreeInfo *splay_tree) +{ + register NodeInfo + *node; + + node=splay_tree->root; + if (splay_tree->root == (NodeInfo *) NULL) + return((NodeInfo *) NULL); + while (node->left != (NodeInfo *) NULL) + node=node->left; + return(node->key); +} + MagickExport SplayTreeInfo *CloneSplayTree(SplayTreeInfo *splay_tree, void *(*clone_key)(void *),void *(*clone_value)(void *)) { + register NodeInfo + *next, + *node; + SplayTreeInfo *clone_tree; @@ -338,62 +356,26 @@ MagickExport SplayTreeInfo *CloneSplayTree(SplayTreeInfo *splay_tree, clone_tree=NewSplayTree(splay_tree->compare,splay_tree->relinquish_key, splay_tree->relinquish_value); LockSemaphoreInfo(splay_tree->semaphore); - if (splay_tree->root != (NodeInfo *) NULL) + if (splay_tree->root == (NodeInfo *) NULL) { - register NodeInfo - *active, - *next, - *node; - - void - *key, - *value; - - key=splay_tree->root->key; - if ((clone_key != (void *(*)(void *)) NULL) && (key != (void *) NULL)) - key=clone_key(key); - value=splay_tree->root->value; - if ((clone_value != (void *(*)(void *)) NULL) && (value != (void *) NULL)) - value=clone_value(value); - (void) AddValueToSplayTree(clone_tree,key,value); - for (node=splay_tree->root; node != (NodeInfo *) NULL; ) + UnlockSemaphoreInfo(splay_tree->semaphore); + return(clone_tree); + } + next=(NodeInfo *) GetFirstSplayTreeNode(splay_tree); + while (next != (NodeInfo *) NULL) + { + SplaySplayTree(splay_tree,next); + (void) AddValueToSplayTree(clone_tree,clone_key(splay_tree->root->key), + clone_value(splay_tree->root->value)); + next=(NodeInfo *) NULL; + node=splay_tree->root->right; + if (node != (NodeInfo *) NULL) { - active=node; - for (node=(NodeInfo *) NULL; active != (NodeInfo *) NULL; ) - { - next=(NodeInfo *) NULL; - if (active->left != (NodeInfo *) NULL) - { - next=node; - key=active->left->key; - if ((clone_key != (void *(*)(void *)) NULL) && - (key != (void *) NULL)) - key=clone_key(key); - value=active->left->value; - if ((clone_value != (void *(*)(void *)) NULL) && - (value != (void *) NULL)) - value=clone_value(value); - (void) AddValueToSplayTree(clone_tree,key,value); - node=active->left; - } - if (active->right != (NodeInfo *) NULL) - { - next=node; - key=active->right->key; - if ((clone_key != (void *(*)(void *)) NULL) && - (key != (void *) NULL)) - key=clone_key(key); - value=active->right->value; - if ((clone_value != (void *(*)(void *)) NULL) && - (value != (void *) NULL)) - value=clone_value(value); - (void) AddValueToSplayTree(clone_tree,key,value); - node=active->right; - } - active=next; - } + while (node->left != (NodeInfo *) NULL) + node=node->left; + next=(NodeInfo *) node->key; } - } + } UnlockSemaphoreInfo(splay_tree->semaphore); return(clone_tree); } @@ -497,20 +479,6 @@ MagickExport int CompareSplayTreeStringInfo(const void *target, % o value: the value. % */ - -static void *GetFirstSplayTreeNode(SplayTreeInfo *splay_tree) -{ - register NodeInfo - *node; - - node=splay_tree->root; - if (splay_tree->root == (NodeInfo *) NULL) - return((NodeInfo *) NULL); - while (node->left != (NodeInfo *) NULL) - node=node->left; - return(node->key); -} - MagickExport MagickBooleanType DeleteNodeByValueFromSplayTree( SplayTreeInfo *splay_tree,const void *value) { diff --git a/magick/version.h b/magick/version.h index b4fb523a3..d7f1c8516 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x660 #define MagickLibVersionText "6.6.0" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-5" +#define MagickLibAddendum "-4" #define MagickLibInterface 3 #define MagickLibMinInterface 3 #define MagickReleaseDate "2010-03-07" diff --git a/version.sh b/version.sh index 18c8878f5..c721628cf 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.0' PACKAGE_LIB_VERSION="0x660" -PACKAGE_RELEASE="5" +PACKAGE_RELEASE="4" PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"