diff options
author | initial.commit <initial.commit@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-27 00:12:16 +0000 |
---|---|---|
committer | initial.commit <initial.commit@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-27 00:12:16 +0000 |
commit | 920c091ac3ee15079194c82ae8a7a18215f3f23c (patch) | |
tree | d28515d1e7732e2b6d077df1b4855ace3f4ac84f /tools/site_compare/operators | |
parent | ae2c20f398933a9e86c387dcc465ec0f71065ffc (diff) | |
download | chromium_src-920c091ac3ee15079194c82ae8a7a18215f3f23c.zip chromium_src-920c091ac3ee15079194c82ae8a7a18215f3f23c.tar.gz chromium_src-920c091ac3ee15079194c82ae8a7a18215f3f23c.tar.bz2 |
Add tools to the repository.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/site_compare/operators')
-rw-r--r-- | tools/site_compare/operators/__init__.py | 26 | ||||
-rw-r--r-- | tools/site_compare/operators/equals.py | 66 | ||||
-rw-r--r-- | tools/site_compare/operators/equals_with_mask.py | 86 |
3 files changed, 178 insertions, 0 deletions
diff --git a/tools/site_compare/operators/__init__.py b/tools/site_compare/operators/__init__.py new file mode 100644 index 0000000..02eac07 --- /dev/null +++ b/tools/site_compare/operators/__init__.py @@ -0,0 +1,26 @@ +#!/usr/bin/python2.4 +# +# Copyright 2007 Google Inc. All Rights Reserved. + +"""Selects the appropriate operator.""" + +__author__ = 'jhaas@google.com (Jonathan Haas)' + + +def GetOperator(operator): + """Given an operator by name, returns its module. + + Args: + operator: string describing the comparison + + Returns: + module + """ + + # TODO(jhaas): come up with a happy way of integrating multiple operators + # with different, possibly divergent and possibly convergent, operators. + + module = __import__(operator, globals(), locals(), ['']) + + return module + diff --git a/tools/site_compare/operators/equals.py b/tools/site_compare/operators/equals.py new file mode 100644 index 0000000..2771401 --- /dev/null +++ b/tools/site_compare/operators/equals.py @@ -0,0 +1,66 @@ +#!/usr/bin/python2.4 +# Copyright 2008, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +"""Compare two images for equality.""" + +from PIL import Image +from PIL import ImageChops + + +def Compare(file1, file2, **kwargs): + """Compares two images to see if they're identical. + + Args: + file1: path to first image to compare + file2: path to second image to compare + kwargs: unused for this operator + + Returns: + None if the images are identical + A tuple of (errorstring, image) if they're not + """ + kwargs = kwargs # unused parameter + + im1 = Image.open(file1) + im2 = Image.open(file2) + + if im1.size != im2.size: + return ("The images are of different size (%s vs %s)" % + (im1.size, im2.size), im1) + + diff = ImageChops.difference(im1, im2) + + if max(diff.getextrema()) != (0, 0): + return ("The images differ", diff) + else: + return None + + +
\ No newline at end of file diff --git a/tools/site_compare/operators/equals_with_mask.py b/tools/site_compare/operators/equals_with_mask.py new file mode 100644 index 0000000..574457a --- /dev/null +++ b/tools/site_compare/operators/equals_with_mask.py @@ -0,0 +1,86 @@ +#!/usr/bin/python2.4 +# Copyright 2008, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +"""Compare two images for equality, subject to a mask.""" + +from PIL import Image +from PIL import ImageChops + +import os.path + + +def Compare(file1, file2, **kwargs): + """Compares two images to see if they're identical subject to a mask. + + An optional directory containing masks is supplied. If a mask exists + which matches file1's name, areas under the mask where it's black + are ignored. + + Args: + file1: path to first image to compare + file2: path to second image to compare + kwargs: ["maskdir"] contains the directory holding the masks + + Returns: + None if the images are identical + A tuple of (errorstring, image) if they're not + """ + + maskdir = None + if "maskdir" in kwargs: + maskdir = kwargs["maskdir"] + + im1 = Image.open(file1) + im2 = Image.open(file2) + + if im1.size != im2.size: + return ("The images are of different size (%r vs %r)" % + (im1.size, im2.size), im1) + + diff = ImageChops.difference(im1, im2) + + if maskdir: + maskfile = os.path.join(maskdir, os.path.basename(file1)) + if os.path.exists(maskfile): + mask = Image.open(maskfile) + + if mask.size != im1.size: + return ("The mask is of a different size than the images (%r vs %r)" % + (mask.size, im1.size), mask) + + diff = ImageChops.multiply(diff, mask.convert(diff.mode)) + + if max(diff.getextrema()) != (0, 0): + return ("The images differ", diff) + else: + return None + + +
\ No newline at end of file |