Skip to content

Commit

Permalink
Bug 674230 - Merge from qcms github branch v4; r=jmuizelaar
Browse files Browse the repository at this point in the history
  • Loading branch information
bgirard committed Jul 27, 2011
1 parent c7daa12 commit 3875922
Show file tree
Hide file tree
Showing 11 changed files with 2,834 additions and 666 deletions.
8 changes: 7 additions & 1 deletion gfx/qcms/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ DIST_INSTALL = 1

EXPORTS = qcms.h qcmstypes.h

CSRCS = iccread.c transform.c
CSRCS = \
chain.c \
iccread.c \
matrix.c \
transform.c \
transform_util.c \
$(NULL)

ifeq (86,$(findstring 86,$(OS_TEST)))
CSRCS += transform-sse2.c
Expand Down
989 changes: 989 additions & 0 deletions gfx/qcms/chain.c

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions gfx/qcms/chain.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/* vim: set ts=8 sw=8 noexpandtab: */
// qcms
// Copyright (C) 2009 Mozilla Foundation
// Copyright (C) 1998-2007 Marti Maria
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the "Software"),
// to deal in the Software without restriction, including without limitation
// the rights to use, copy, modify, merge, publish, distribute, sublicense,
// and/or sell copies of the Software, and to permit persons to whom the Software
// is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

#ifndef _QCMS_CHAIN_H
#define _QCMS_CHAIN_H

// Generates and returns a 3D LUT with lutSize^3 samples using the provided src/dest.
float* qcms_chain_transform(qcms_profile *in, qcms_profile *out, float *src, float *dest, size_t lutSize);

#endif
Loading

0 comments on commit 3875922

Please sign in to comment.