CALAMARI

From PDWiki

Jump to: navigation, search


Contents

About CALAMARI

CALAMARI is a primitive diff/merge tool for raster images. It is based on the idea of comparing the color value of each pixel in one or more images to the color value of a corresponding pixel in a counterpart image of equal dimensions.

A while back I gave a talk on integrating and merging that used simple raster images to represent files and diffs. The images made it easy to get the concepts across, but all of the merge results had to be mocked up by hand, making it impossible to demonstrate the examples with a real Perforce server. CALAMARI was written as a way of playing a bit more with this idea and making it easier to generate these types of examples, as well as opening the possibility of using them in a live demo. It is also very occasionally useful when working with images in Perforce.

Command line invocation

To use CALAMARI as a diff tool: 

calamari IMAGE1 IMAGE2

To use CALAMARI as a merge tool: 

calamari BASE THEIRS YOURS [RESULT]

The interface

For a complete description of each interface element, see the online help that's bundled with CALAMARI.

The following screenshot shows the merge tool mode being used to merge changes to an MS Paint drawing of a squid:

Image:Calamari-screen.png

A step-by-step walkthrough of this example merge is given here.

License

Copyright (c) 2006-2008, Sam Stafford. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. 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.

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 PERFORCE SOFTWARE, INC. 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.

Recent Changes RSS_Feed.gif


Retrieved from "http://public.perforce.com/wiki/CALAMARI"
Personal tools