From: cristy Date: Wed, 22 Aug 2012 00:37:49 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5090 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f82d8eba00876266bfb8281c02ede8cd775fd49;p=imagemagick --- diff --git a/tests/validate-colorspace.sh b/tests/validate-colorspace.sh deleted file mode 100755 index 7f12b7582..000000000 --- a/tests/validate-colorspace.sh +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -. ${srcdir}/tests/common.sh - -depth=`eval ${MAGICK} xc:none -format '%[fx:QuantumRange]' info:-` -if [ "X$depth" == "X255" ]; then - exit 0 -fi - -# how to generate a one pixel (average rose) color and output its values -in="rose: -scale 1x1" # a one pixel image of the average color. -out="-format '%[fx:int(255*r+.5)],%[fx:int(255*g+.5)],%[fx:int(255*b+.5)]' info:-" - -# ---------------- - -# Colors to compare results to. -error=false -average=`eval ${MAGICK} "$in" -noop "$out"` -too_dark=`eval ${MAGICK} "$in" -colorspace RGB "$out"` -too_light=`eval ${MAGICK} "$in" -set colorspace RGB -colorspace sRGB "$out"` -format='%-30s%s\n' # results formating -format2='%-30s%-14s%s\n' - -printf "$format2" "Average \"rose:\" Color" "$average" "sRGB(rose)" -printf "$format2" "Too Dark Color" "$too_dark" "sRGB(rose)->RGB result" -printf "$format2" "Too Light Color" "$too_light" "RGB(rose)->sRGB result" -echo '' - -# -# Sanity checks -# -# NOTE: as a extra validation on sanity checks below... -# eval ${MAGICK} "$in" -gamma .454545 "$out" -# produces a value of 74,25,20 which is close to 73,26,21 below. -# eval ${MAGICK} "$in" -gamma 2.2 "$out" -# produces a value of 198,158,151 whcih is close to 199,160,152 below. -# -# Actual values used below come from IM v6.5.4-7 colorspace conversions -# -error=false -if [ "X$average" != "X146,89,80" ]; then - echo "Sanity Failure: Average expected to be 145,89,80 - ABORTING" - error=true -fi -if [ "X$too_dark" != "X73,26,21" ]; then - echo "Sanity Failure: Too Dark expected to be 73,26,21 - ABORTING" - error=true -fi -if [ "X$too_light" != "X199,160,152" ]; then - echo "Sanity Failure: Too Light expected to be 199,160,152 - ABORTING" - error=true -fi -$error && exit 1 - -test_color() { - test="sRGB" - cs=''; - for i in "$@"; do - test="${test}->$i" # format of the test being performed - cs="$cs -colorspace $i" # colorspace operations to perform test - done - color=`eval ${MAGICK} "$in" $cs "$out"` - - if [ "X$color" = "X$average" ]; then - printf "$format" "$test" "good" - return - fi - # Its failed the round-trip test, now report how it failed! - error=true - if [ "X$color" = "X$too_light" ]; then - printf "$format" "$test" "TOO_LIGHT" - return - fi - if [ "X$color" = "X$too_dark" ]; then - printf "$format" "$test" "TOO_DARK" - return - fi - printf "$format" "$test" "UNKNOWN COLOR (expect $average, got $color)" -} - -# ---------------- - -test_color RGB sRGB # round trip (parts tested above) - -test_color XYZ sRGB -test_color XYZ RGB sRGB -test_color RGB XYZ sRGB - -test_color LAB sRGB -test_color XYZ LAB sRGB -test_color LAB XYZ sRGB -test_color RGB LAB sRGB -test_color LAB RGB sRGB - -test_color CMY sRGB -test_color CMYK sRGB -test_color HSL sRGB -test_color HSB sRGB -test_color HWB sRGB -test_color Log sRGB -test_color YIQ sRGB -test_color YUV sRGB -test_color YCbCr sRGB -test_color OHTA sRGB - -$error && exit 1 # return the overall error result -exit 0 diff --git a/tests/validate-compare.sh b/tests/validate-compare.sh deleted file mode 100755 index 481774373..000000000 --- a/tests/validate-compare.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate compare diff --git a/tests/validate-composite.sh b/tests/validate-composite.sh deleted file mode 100755 index 84193ce54..000000000 --- a/tests/validate-composite.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate composite diff --git a/tests/validate-convert.sh b/tests/validate-convert.sh deleted file mode 100755 index 6a08f2ef2..000000000 --- a/tests/validate-convert.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate convert diff --git a/tests/validate-formats-in-memory.sh b/tests/validate-formats-in-memory.sh deleted file mode 100755 index 513e758d4..000000000 --- a/tests/validate-formats-in-memory.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate formats-in-memory diff --git a/tests/validate-formats-on-disk.sh b/tests/validate-formats-on-disk.sh deleted file mode 100755 index ff0b61eb7..000000000 --- a/tests/validate-formats-on-disk.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate formats-on-disk diff --git a/tests/validate-identify.sh b/tests/validate-identify.sh deleted file mode 100755 index 731bd13de..000000000 --- a/tests/validate-identify.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate identify diff --git a/tests/validate-import.sh b/tests/validate-import.sh deleted file mode 100755 index 29dc5f895..000000000 --- a/tests/validate-import.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate import-export diff --git a/tests/validate-montage.sh b/tests/validate-montage.sh deleted file mode 100755 index 6110f205c..000000000 --- a/tests/validate-montage.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate montage diff --git a/tests/validate-pipe.sh b/tests/validate-pipe.sh deleted file mode 100755 index 4aa231112..000000000 --- a/tests/validate-pipe.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# -set -e # Exit on any error -[ "X$srcdir" = "X" ] && srcdir=`pwd` -. ${srcdir}/tests/common.sh - -${MAGICK} pnm:- null: < ${REFERENCE_IMAGE} -${MAGICK} pnm:- info: < ${REFERENCE_IMAGE} -${MAGICK} pnm:- miff:- < ${REFERENCE_IMAGE} | ${IDENTIFY} - -${MAGICK} pnm:- - < ${REFERENCE_IMAGE} | ${IDENTIFY} - -${MAGICK} ${REFERENCE_IMAGE} -write null: null: -${MAGICK} ${REFERENCE_IMAGE} -write info: null: -${MAGICK} ${REFERENCE_IMAGE} -write miff:- null: | ${IDENTIFY} - -${MAGICK} ${REFERENCE_IMAGE} -write - null: | ${IDENTIFY} - - -# IMv7 "magick" testing -# -read option -${MAGICK} -read ${REFERENCE_IMAGE} info: -# -exit can be used insted of implicit write -${MAGICK} ${REFERENCE_IMAGE} -write info: -exit -# null: does not require an image during write -${MAGICK} -write null: -exit -# implied write null: without image -${MAGICK} ${REFERENCE_IMAGE} -write info: +delete null: -# Write to file decriptor -${MAGICK} ${REFERENCE_IMAGE} fd:6 6>&1 | ${IDENTIFY} - -# Read from file decriptor -exec 5<${REFERENCE_IMAGE} -${MAGICK} fd:5 info: -exec 5<&- -# pipelined magick script -echo "-read ${REFERENCE_IMAGE} -write info:" | ${MAGICK} -script - -# pipelined magick script, input image pre-read -echo "-write info:" | ${MAGICK} ${REFERENCE_IMAGE} -script - -# pipelined script from file descriptor, read image from stdin -echo "-read pnm:- -write info:" |\ - ${MAGICK} -script fd:5 5<&0 <${REFERENCE_IMAGE} - diff --git a/tests/validate-stream.sh b/tests/validate-stream.sh deleted file mode 100755 index b87ace3fe..000000000 --- a/tests/validate-stream.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization -# dedicated to making software imaging solutions freely available. -# -# You may not use this file except in compliance with the License. You may -# obtain a copy of the License at -# -# http://www.imagemagick.org/script/license.php -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# Test for 'validate' utility. -# - -set -e # Exit on any error -. ${srcdir}/tests/common.sh - -${VALIDATE} -validate stream