You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
(67) |
Apr
(455) |
May
(202) |
Jun
(136) |
Jul
(203) |
Aug
(60) |
Sep
(88) |
Oct
(64) |
Nov
(56) |
Dec
(78) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(271) |
Feb
(207) |
Mar
|
Apr
|
May
(167) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Foster B. <fos...@us...> - 2006-01-06 18:36:00
|
Update of /cvsroot/adobe-source/adobe-source/adobe/documentation/sources/structure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/documentation/sources/structure Modified Files: news.dox toc.dox Log Message: asl 1.0.12 Index: news.dox =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/documentation/sources/structure/news.dox,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** news.dox 2 Dec 2005 02:52:55 -0000 1.4 --- news.dox 6 Jan 2006 18:35:20 -0000 1.5 *************** *** 6,9 **** --- 6,34 ---- \page top_news Top News + \par January 05, 2005 - ASL 1.0.12 Released + Highlights of the 1.0.12 changes include: + - The Generic Image Library (GIL) has been added. This library allows for writing generic imaging algorithms with performance comparable to hand-coding for a particular image type + - Lubomir has been hard at work getting the GIL tutorial and design guide ready for release. We anticipate it within a couple weeks. + - ASL now compiles against Boost 1.33.1 + - IDE projects have been added for XCode 2.2 + - Many improvements to Adobe Begin and Win32's ui_core + - A significant overhaul of adobe::forest. + - For more information and more changes see the \ref asl_release_notes + \par + Head over to the <a href="http://sourceforge.net/project/showfiles.php?group_id=132417&package_id=145420">download</a> section to grab it. + + \par January 05, 2005 - In Memory of Grant Munsey + \htmlonly + <table><tr><td align='center' valign='top'> + <img src="grant_munsey.jpg"/> + <br/> + <b>Grant and his wife Sandy in 2000</b> + </td><td valign='top'> + \endhtmlonly + On the morning of December 25, 2005, we lost a great friend and brilliant computer scientist. Grant Munsey joined Adobe in 1997 and convinced Adobe senior management that it was time the company started to give back to the open-source community. Among other achievements, he went on to found the original opensource.adobe.com web site. Through his efforts both Adobe and the community as a whole were changed for the better. In April 2001 Grant was struck by a serious illness from which he never fully recovered. For the foundation he laid and the basis upon which opensource.adobe.com stands, it is our honor to dedicate this release to him. + \htmlonly + </td></tr></table> + \endhtmlonly + \par December 01, 2005 - ASL 1.0.11 Released Highlights of the 1.0.11 changes include: *************** *** 33,36 **** --- 58,62 ---- Head over to the <a href="http://sourceforge.net/project/showfiles.php?group_id=132417&package_id=145420">download</a> section to grab it. + \page previous_news Previous News \par October 06, 2005 - ASL 1.0.9 Released Highlights of the 1.0.9 changes include: *************** *** 43,47 **** Head over to the <a href="http://sourceforge.net/project/showfiles.php?group_id=132417&package_id=145420">download</a> section to grab it. - \page previous_news Previous News \par September 01, 2005 - ASL 1.0.8 Released Highlights of the 1.0.8 changes include: --- 69,72 ---- *************** *** 119,121 **** --- 144,149 ---- We are happy to announce the release of the Adobe Open Source Libraries to the public. We have documentation and some tutorials available (\ref asl_home), as well as sources and binaries available for <a href="http://sourceforge.net/project/showfiles.php?group_id=132417&package_id=145420">download</a>. A good place to start is by reading the \ref asl_foreword and \ref asl_overview. + \page opensource_news_dummy_page stub page + This stub page is included so Doxygen will include the following images: + \image html grant_munsey.jpg "Grant and his wife Sandy in 2000" */ Index: toc.dox =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/documentation/sources/structure/toc.dox,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** toc.dox 2 Dec 2005 02:52:55 -0000 1.6 --- toc.dox 6 Jan 2006 18:35:20 -0000 1.7 *************** *** 12,15 **** --- 12,16 ---- - \ref asl_concepts - \ref stldoc_Assignable + - \ref stldoc_BackInsertionSequence - \ref concept_convertible_to_bool - \ref concept_convertible_to_function *************** *** 17,22 **** --- 18,25 ---- - \ref stldoc_DefaultConstructible - \ref stldoc_EqualityComparable + - \ref stldoc_FrontInsertionSequence - \ref stldoc_LessThanComparable - \ref concept_regular_type + - \ref stldoc_ReversibleContainer - \ref concept_transform_function - \ref asl_libraries *************** *** 28,32 **** - \ref eve_engine - \ref eveparser ! \if stlab_website - \ref asl_gil \endif - \ref adobe_final - \ref forest_related --- 31,35 ---- - \ref eve_engine - \ref eveparser ! - \ref asl_gil - \ref adobe_final - \ref forest_related |
Update of /cvsroot/adobe-source/adobe-source/adobe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe Modified Files: Jamfile.v2 adam.hpp adam_evaluate.hpp adam_parser.hpp algorithm.hpp array.hpp array_fwd.hpp circular_queue.hpp cmath.hpp config.hpp conversion.hpp copy_on_write.hpp counter.hpp dancing_links.hpp dictionary.hpp dictionary_fwd.hpp empty.hpp eve.hpp eve_evaluate.hpp eve_parser.hpp extents.hpp final.hpp forest.hpp functional.hpp istream.hpp istream_fwd.hpp iterator.hpp md5.hpp name.hpp name_fwd.hpp numeric.hpp once.hpp regular_object.hpp sha.hpp static_table.hpp string.hpp table_index.hpp thread_id.hpp typeinfo.hpp unicode.hpp value.hpp value_fwd.hpp virtual_machine.hpp xstring.hpp zuid.hpp Added Files: mismatch.hpp Log Message: asl 1.0.12 Index: copy_on_write.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/copy_on_write.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** copy_on_write.hpp 2 Dec 2005 02:52:49 -0000 1.6 --- copy_on_write.hpp 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <algorithm> Index: thread_id.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/thread_id.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** thread_id.hpp 2 Dec 2005 02:52:49 -0000 1.2 --- thread_id.hpp 6 Jan 2006 18:35:02 -0000 1.3 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated and others Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated and others Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_THREAD_ID_HPP + #include <adobe/config.hpp> + /*************************************************************************************************/ Index: dictionary.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/dictionary.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** dictionary.hpp 2 Dec 2005 02:52:49 -0000 1.4 --- dictionary.hpp 6 Jan 2006 18:35:02 -0000 1.5 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <cstddef> #include <functional> Index: static_table.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/static_table.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** static_table.hpp 2 Dec 2005 02:52:49 -0000 1.4 --- static_table.hpp 6 Jan 2006 18:35:02 -0000 1.5 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <utility> Index: extents.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/extents.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** extents.hpp 2 Dec 2005 02:52:49 -0000 1.5 --- extents.hpp 6 Jan 2006 18:35:02 -0000 1.6 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /****************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /****************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_EXTENTS_HPP + #include <adobe/config.hpp> + #include <boost/array.hpp> #include <boost/operators.hpp> Index: functional.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/functional.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** functional.hpp 2 Dec 2005 02:52:49 -0000 1.6 --- functional.hpp 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_FUNCTIONAL_HPP + #include <adobe/config.hpp> + #include <cassert> #include <functional> Index: md5.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/md5.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** md5.hpp 2 Dec 2005 02:52:49 -0000 1.2 --- md5.hpp 6 Jan 2006 18:35:02 -0000 1.3 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated and others Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated and others Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_MD5_HPP + #include <adobe/config.hpp> + #include <boost/cstdint.hpp> #include <boost/array.hpp> Index: conversion.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/conversion.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** conversion.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- conversion.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_CONVERSION_HPP + #include <adobe/config.hpp> + /*************************************************************************************************/ Index: unicode.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/unicode.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** unicode.hpp 2 Dec 2005 02:52:49 -0000 1.6 --- unicode.hpp 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <adobe/algorithm.hpp> Index: dictionary_fwd.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/dictionary_fwd.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dictionary_fwd.hpp 2 Dec 2005 02:52:49 -0000 1.6 --- dictionary_fwd.hpp 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <adobe/conversion.hpp> #include <adobe/copy_on_write.hpp> Index: virtual_machine.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/virtual_machine.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** virtual_machine.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- virtual_machine.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_VIRTUAL_MACHINE_HPP + #include <adobe/config.hpp> + #include <bitset> #include <vector> Index: config.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/config.hpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** config.hpp 2 Dec 2005 02:52:49 -0000 1.12 --- config.hpp 6 Jan 2006 18:35:02 -0000 1.13 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) *************** *** 28,32 **** #define ADOBE_VERSION_MAJOR 1 #define ADOBE_VERSION_MINOR 0 ! #define ADOBE_VERSION_SUBMINOR 11 #define ADOBE_VERSION (ADOBE_VERSION_MAJOR * 100000 + ADOBE_VERSION_MINOR * 100 + ADOBE_VERSION_SUBMINOR) --- 28,32 ---- #define ADOBE_VERSION_MAJOR 1 #define ADOBE_VERSION_MINOR 0 ! #define ADOBE_VERSION_SUBMINOR 12 #define ADOBE_VERSION (ADOBE_VERSION_MAJOR * 100000 + ADOBE_VERSION_MINOR * 100 + ADOBE_VERSION_SUBMINOR) Index: final.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/final.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** final.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- final.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_FINAL_HPP + #include <adobe/config.hpp> + /*************************************************************************************************/ Index: value.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/value.hpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** value.hpp 2 Dec 2005 02:52:49 -0000 1.8 --- value.hpp 6 Jan 2006 18:35:02 -0000 1.9 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <adobe/value_fwd.hpp> Index: value_fwd.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/value_fwd.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** value_fwd.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- value_fwd.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,17 **** #define ADOBE_VALUE_FWD_HPP /*************************************************************************************************/ ! namespace adobe ! { /*************************************************************************************************/ --- 10,18 ---- #define ADOBE_VALUE_FWD_HPP + #include <adobe/config.hpp> + /*************************************************************************************************/ ! namespace adobe { /*************************************************************************************************/ Index: sha.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/sha.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sha.hpp 2 Dec 2005 02:52:49 -0000 1.2 --- sha.hpp 6 Jan 2006 18:35:02 -0000 1.3 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <adobe/algorithm.hpp> Index: adam_parser.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/adam_parser.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** adam_parser.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- adam_parser.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_ADAM_PARSER_HPP + #include <adobe/config.hpp> + #include <iosfwd> #include <string> Index: array_fwd.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/array_fwd.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** array_fwd.hpp 2 Dec 2005 02:52:49 -0000 1.4 --- array_fwd.hpp 6 Jan 2006 18:35:02 -0000 1.5 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <cstddef> #include <iterator> Index: name_fwd.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/name_fwd.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** name_fwd.hpp 2 Dec 2005 02:52:49 -0000 1.4 --- name_fwd.hpp 6 Jan 2006 18:35:02 -0000 1.5 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_NAME_FWD_HPP + #include <adobe/config.hpp> + #include <cstddef> Index: name.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/name.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** name.hpp 2 Dec 2005 02:52:49 -0000 1.5 --- name.hpp 6 Jan 2006 18:35:02 -0000 1.6 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_NAME_HPP + #include <adobe/config.hpp> + #include <adobe/name_fwd.hpp> Index: regular_object.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/regular_object.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** regular_object.hpp 2 Dec 2005 02:52:49 -0000 1.2 --- regular_object.hpp 6 Jan 2006 18:35:02 -0000 1.3 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_REGULAR_OBJECT_HPP + #include <adobe/config.hpp> + #include <adobe/algorithm.hpp> #include <adobe/typeinfo.hpp> Index: empty.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/empty.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** empty.hpp 2 Dec 2005 02:52:49 -0000 1.5 --- empty.hpp 6 Jan 2006 18:35:02 -0000 1.6 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <boost/operators.hpp> #include <boost/mpl/bool.hpp> --- NEW FILE: mismatch.hpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ /*************************************************************************************************/ #ifndef ADOBE_MISMATCH_HPP #define ADOBE_MISMATCH_HPP #include <adobe/config.hpp> #include <iterator> #include <utility> /*************************************************************************************************/ namespace adobe { /*************************************************************************************************/ namespace implementation { /*************************************************************************************************/ template <typename C1, // Category of I1 typename C2> // Category of I2 struct mismatch_t; /*************************************************************************************************/ } // namespace implementation /*************************************************************************************************/ #if !defined(ADOBE_NO_DOCUMENTATION) namespace fn { } using namespace fn; namespace fn { #endif /*************************************************************************************************/ /* REVISIT (sparent) : With mismatch_n() we are throwing away the resulting value of n - this is only because it complciates using it in the implementation of mismatch() but I'm not convinced that the interface to mismatch() is correct either. */ template <typename I1, // I1 models InputIterator typename I2, // I2 models InputIterator typename N> // N models Integer std::pair<I1, I2> mismatch_n(I1 first1, I2 first2, N n) { while (n && *first1 == *first2) { --n; ++first1; ++first2; } return std::make_pair(first1, first2); } template <typename I1, // I1 models InputIterator typename I2> // I2 models InputIterator std::pair<I1, I2> mismatch(I1 first1, I1 last1, I2 first2, I2 last2) { return implementation::mismatch_t<typename std::iterator_traits<I1>::iterator_category, typename std::iterator_traits<I2>::iterator_category>()(first1, last1, first2, last2); } /*************************************************************************************************/ #if !defined(ADOBE_NO_DOCUMENTATION) } // namespace fn #endif /*************************************************************************************************/ namespace implementation { /*************************************************************************************************/ template <typename C1, // Category of I1 typename C2> // Category of I2 struct mismatch_t { template <typename I1, // I1 models InputIterator typename I2> // I2 models InputIterator std::pair<I1, I2> operator()(I1 first1, I1 last1, I2 first2, I2 last2) const { while (first1 != last1 && first2 != last2 && *first1 == * first2) { ++first1; ++first2; } return std::make_pair(first1, first2); } }; template <> struct mismatch_t <std::random_access_iterator_tag, std::random_access_iterator_tag> { template <typename I1, // I1 models RandomAccessIterator typename I2> // I2 models RandomAccessIterator std::pair<I1, I2> operator()(I1 first1, I1 last1, I2 first2, I2 last2) const { if ((last1 - first1) < (last2 - first2)) { return adobe::mismatch_n(first1, first2, last1 - first1); } return adobe::mismatch_n(first1, first2, last2 - first2); } }; /*************************************************************************************************/ } // namespace implementation } // namespace adobe /*************************************************************************************************/ #endif // ADOBE_MISMATCH_HPP /*************************************************************************************************/ Index: istream.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/istream.hpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** istream.hpp 2 Dec 2005 02:52:49 -0000 1.10 --- istream.hpp 6 Jan 2006 18:35:02 -0000 1.11 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_ISTREAM_HPP + #include <adobe/config.hpp> + #include <ios> #include <istream> Index: Jamfile.v2 =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/Jamfile.v2,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jamfile.v2 2 Dec 2005 02:52:49 -0000 1.3 --- Jamfile.v2 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,26 **** import feature : feature ; project adobe ! : source-location . ! : requirements ! <include>.. ! <toolset>darwin,<variant>debug:<cxxflags>"-Werror" ! <toolset>gcc,<variant>debug:<cxxflags>"-Werror" ! <toolset>msvc:<cxxflags>"-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE" ! <toolset>msvc:<cxxflags>"/W3 /WX /Wp64 /Zc:wchar_t /Zc:forScope" ! <link>static:<define>BOOST_THREAD_USE_LIB ! <link>static:<define>BOOST_SIGNALS_STATIC_LINK ! <define>NOMINMAX ! <define>BOOST_ALL_NO_LIB ! : usage-requirements # ! # These usage requirements propagate to everything which uses this project. # ! <include>.. ; ! feature asl : none dev : composite ; # We don't turn on link-incompatible for now; ! feature.compose <asl>dev : <define>ADOBE_SERIALIZATION ; --- 1,62 ---- + # Main Jamfile for building ASL + + import testing ; + import os ; import feature : feature ; + # adds the asl feature to the adobe subprojects + feature asl : none dev : composite ; # We don't turn on link-incompatible for now; + feature.compose <asl>dev : <define>ADOBE_SERIALIZATION ; + + # + # We build two libraries, asl and asl_dev. asl_dev includes the future + # sources and supports serialization. We define a project to make it + # easy to maintain various flags. + # project adobe ! : source-location . ! : requirements ! <include>.. ! <toolset>msvc:<cxxflags>"-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE" ! <toolset>msvc:<cxxflags>"/W3 /WX /Wp64 /Zc:wchar_t /Zc:forScope" ! <link>static:<define>BOOST_THREAD_USE_LIB ! <link>static:<define>BOOST_SIGNALS_STATIC_LINK ! <define>NOMINMAX ! <define>BOOST_ALL_NO_LIB ! : usage-requirements ! <include>.. ! <toolset>darwin:<linkflags>"-framework Carbon" ! ; ! # ! # The FUTURE_SRC set is the extra code required when using serialization # ! ! FUTURE_SOURCE_SET = ! assemblage ! iomanip ! iomanip_pdf ; ! # ! # COMMON_SOURCE_SET is used by both instances of ASL ! # + COMMON_SOURCE_SET = + [ glob source/*.cpp ] + ..//boost_filesystem + ..//boost_thread + ..//boost_signals + ; + + lib asl + : $(COMMON_SOURCE_SET) + ; + + lib asl_dev + : $(COMMON_SOURCE_SET) + ./future/source/$(FUTURE_SOURCE_SET).cpp + : <asl>dev + ; Index: forest.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/forest.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** forest.hpp 2 Dec 2005 02:52:49 -0000 1.7 --- forest.hpp 6 Jan 2006 18:35:02 -0000 1.8 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* [...1551 lines suppressed...] *** 839,847 **** template <class C> // C models a fullorder Cursor range ! inline std::pair<preorder_iterator<typename boost::range_const_iterator<C>::type>, ! preorder_iterator<typename boost::range_const_iterator<C>::type> > preorder_range(const C& x) { ! typedef preorder_iterator<typename boost::range_const_iterator<C>::type> iterator; return std::make_pair(iterator(boost::begin(x)), iterator(boost::end(x))); --- 966,974 ---- template <class C> // C models a fullorder Cursor range ! inline std::pair<edge_iterator<typename boost::range_const_iterator<C>::type, forest_leading_edge>, ! edge_iterator<typename boost::range_const_iterator<C>::type, forest_leading_edge> > preorder_range(const C& x) { ! typedef edge_iterator<typename boost::range_const_iterator<C>::type, forest_leading_edge> iterator; return std::make_pair(iterator(boost::begin(x)), iterator(boost::end(x))); Index: eve.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/eve.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** eve.hpp 2 Dec 2005 02:52:49 -0000 1.9 --- eve.hpp 6 Jan 2006 18:35:02 -0000 1.10 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_EVE_HPP + #include <adobe/config.hpp> + #include <utility> #include <vector> Index: numeric.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/numeric.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** numeric.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- numeric.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_NUMERIC_HPP + #include <adobe/config.hpp> + #include <iterator> #include <numeric> Index: typeinfo.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/typeinfo.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** typeinfo.hpp 2 Dec 2005 02:52:49 -0000 1.4 --- typeinfo.hpp 6 Jan 2006 18:35:02 -0000 1.5 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <string> #include <typeinfo> Index: eve_parser.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/eve_parser.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** eve_parser.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- eve_parser.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_EVE_PARSER_HPP + #include <adobe/config.hpp> + #include <string> Index: cmath.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/cmath.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cmath.hpp 3 May 2005 23:50:20 -0000 1.2 --- cmath.hpp 6 Jan 2006 18:35:02 -0000 1.3 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) Index: zuid.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/zuid.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** zuid.hpp 2 Jun 2005 23:14:11 -0000 1.1 --- zuid.hpp 6 Jan 2006 18:35:02 -0000 1.2 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated and others Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated and others Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) Index: string.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/string.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** string.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- string.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_STRING_HPP + #include <adobe/config.hpp> + #include <string> #include <cstring> Index: array.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/array.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** array.hpp 2 Dec 2005 02:52:49 -0000 1.5 --- array.hpp 6 Jan 2006 18:35:02 -0000 1.6 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_ARRAY_HPP + #include <adobe/config.hpp> + /*************************************************************************************************/ Index: dancing_links.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/dancing_links.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dancing_links.hpp 2 Dec 2005 02:52:49 -0000 1.2 --- dancing_links.hpp 6 Jan 2006 18:35:02 -0000 1.3 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /****************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /****************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /****************************************************************************************************/ + #include <adobe/config.hpp> + #include <boost/function.hpp> #include <boost/noncopyable.hpp> Index: table_index.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/table_index.hpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** table_index.hpp 2 Dec 2005 02:52:49 -0000 1.5 --- table_index.hpp 6 Jan 2006 18:35:02 -0000 1.6 *************** *** 1,10 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ #include <functional> --- 1,17 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ + #ifndef ADOBE_TABLE_INDEX_HPP + #define ADOBE_TABLE_INDEX_HPP + + /*************************************************************************************************/ + + #include <adobe/config.hpp> + #include <functional> *************** *** 544,545 **** --- 551,556 ---- /*************************************************************************************************/ + + #endif + + /*************************************************************************************************/ Index: xstring.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/xstring.hpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xstring.hpp 2 Dec 2005 02:52:49 -0000 1.6 --- xstring.hpp 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <adobe/name.hpp> #include <adobe/unicode.hpp> Index: circular_queue.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/circular_queue.hpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** circular_queue.hpp 2 Dec 2005 02:52:49 -0000 1.7 --- circular_queue.hpp 6 Jan 2006 18:35:02 -0000 1.8 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,15 **** --- 12,17 ---- /*************************************************************************************************/ + #include <adobe/config.hpp> + #include <cassert> #include <vector> *************** *** 55,59 **** #if !defined(ADOBE_NO_DOCUMENTATION) ! circular_queue(std::size_t capacity); circular_queue(const circular_queue& rhs); --- 57,61 ---- #if !defined(ADOBE_NO_DOCUMENTATION) ! circular_queue(std::size_t capacity = 0); circular_queue(const circular_queue& rhs); *************** *** 90,95 **** friend bool operator == <> (const circular_queue& x, const circular_queue& y); - - /* WARNING (sparent) : Order of members is important to initialization */ typedef typename std::vector<value_type> container_t; --- 92,95 ---- *************** *** 97,104 **** --- 97,106 ---- typedef typename container_t::const_iterator const_iterator; + /* WARNING (sparent) : Order of members is important to initialization */ container_t container_m; iterator begin_m; iterator end_m; bool is_empty_m; + /* WARNING (sparent) : Order of members is important to initialization */ // Note that these ranges assume non-empty. *************** *** 146,160 **** circular_queue<T>& circular_queue<T>::operator = (const circular_queue& rhs) { ! begin_m = boost::begin(container_m); ! end_m = boost::begin(container_m); ! ! is_empty_m = rhs.is_empty_m; ! ! if (is_empty_m) return *this; ! ! end_m = adobe::copy(rhs.first_range(), end_m); ! end_m = adobe::copy(rhs.second_range(), end_m); ! ! return *this; } --- 148,152 ---- circular_queue<T>& circular_queue<T>::operator = (const circular_queue& rhs) { ! return adobe::assign(rhs, *this); } *************** *** 232,279 **** { /* ! Each queue can consist of two ranges - to compare two queues of equal size we have to ! compare two ranges of potentially different sizes. This is done by dividing both pairs of ! ranges into 3 ranges with corresponding equal sizes. Any range may end up empty. ! ! If we extended this to handle operating on n ranges it might be a useful generic algorithm ! for working with seqmented iterators - consider comparing two deques efficiently. */ ! if (x.size() != y.size()) return false; ! if (x.empty() && y.empty()) return true; ! ! // Determine the size of the first range then compare them. ! ! T* xend (x.begin_m < x.end_m ? x.end_m : boost::end(x.container_m)); ! T* yend (y.begin_m < y.end_m ? y.end_m : boost::end(y.container_m)); ! ! std::ptrdiff_t xsize (std::distance(x.begin_m, xend)); ! std::ptrdiff_t ysize (std::distance(y.begin_m, yend)); ! ! std::ptrdiff_t size (std::min(xsize, ysize)); ! ! if(!std::equal(x.begin_m, x.begin_m + size, y.begin_m)) return false; ! ! // determine the start and size of the second range then compare them. ! ! T* xbegin (x.begin_m + size); ! T* ybegin (y.begin_m + size); ! ! if (xbegin == boost::end(x.container_m)) xbegin = boost::begin(x.container_m); ! if (ybegin == boost::end(y.container_m)) ybegin = boost::begin(y.container_m); ! ! size = std::max(xsize, ysize) - size; ! ! if (!std::equal(xbegin, xbegin + size, ybegin)) return false; ! ! // determine the start of the final range and then compare them. ! ! xbegin = x.begin_m + size; ! ybegin = y.begin_m + size; ! if (xbegin == boost::end(x.container_m)) xbegin = boost::begin(x.container_m); ! if (ybegin == boost::end(y.container_m)) ybegin = boost::begin(y.container_m); ! return std::equal(xbegin, x.end_m, ybegin); } --- 224,240 ---- { /* ! REVISIT (sparent) : I'm trying to move the code towards equality of containers to mean "the ! size is the same and all the parts are the same." By making the segmented iterators part of ! a public begin, end interface this would simply be a generic. "equal_containers()" function. */ + typedef typename adobe::circular_queue<T>::const_range const_range; ! if (x.size() != y.size()) return false; ! const_range sequence1[] = { x.first_range(), x.second_range() }; ! const_range sequence2[] = { y.first_range(), y.second_range() }; ! return adobe::equal(adobe::make_segmented_range(sequence1), ! adobe::make_segmented_iterator(sequence2)); } Index: adam_evaluate.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/adam_evaluate.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** adam_evaluate.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- adam_evaluate.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_ADAM_EVALUATE_HPP + #include <adobe/config.hpp> + #include <adobe/adam.hpp> // REVISIT (sparent) : need an adam_fwd.hpp #include <adobe/adam_parser.hpp> Index: counter.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/counter.hpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** counter.hpp 2 Dec 2005 02:52:49 -0000 1.3 --- counter.hpp 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 12,16 **** /*************************************************************************************************/ ! #include <boost/config.hpp> #include <cstddef> #include <boost/noncopyable.hpp> --- 12,17 ---- /*************************************************************************************************/ ! #include <adobe/config.hpp> ! #include <cstddef> #include <boost/noncopyable.hpp> Index: algorithm.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/algorithm.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** algorithm.hpp 2 Dec 2005 02:52:49 -0000 1.9 --- algorithm.hpp 6 Jan 2006 18:35:02 -0000 1.10 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /*************************************************************************************************/ *************** *** 10,13 **** --- 10,15 ---- #define ADOBE_ALGORITHM_HPP + #include <adobe/config.hpp> + #include <algorithm> #include <functional> *************** *** 23,26 **** --- 25,29 ---- #include <boost/range/begin.hpp> #include <boost/range/end.hpp> + #include <boost/range/iterator.hpp> #if defined(__MWERKS__) *************** *** 30,33 **** --- 33,39 ---- #include <adobe/iterator.hpp> #include <adobe/functional.hpp> + #include <adobe/mismatch.hpp> + #include <adobe/algorithm/assign.hpp> + #include <adobe/algorithm/reverse.hpp> #include <adobe/source/swap.hpp> *************** *** 662,683 **** } - template <class BidirectionalRange> - inline void reverse(BidirectionalRange& range) - { - std::reverse(boost::begin(range), boost::end(range)); - } - - template <class BidirectionalRange, class OutputIterator> - inline void reverse_copy(BidirectionalRange& range, OutputIterator result) - { - std::reverse_copy(boost::begin(range), boost::end(range), result); - } - - template <class BidirectionalRange, class OutputIterator> - inline void reverse_copy(const BidirectionalRange& range, OutputIterator result) - { - std::reverse_copy(boost::begin(range), boost::end(range), result); - } - template <class RandomAccessRange> inline void random_shuffle(RandomAccessRange& range) --- 668,671 ---- Index: iterator.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/iterator.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** iterator.hpp 2 Dec 2005 02:52:49 -0000 1.9 --- iterator.hpp 6 Jan 2006 18:35:02 -0000 1.10 *************** *** 1,8 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! #include <adobe/config.hpp> /*************************************************************************************************/ --- 1,8 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ ! /******************************************... [truncated message content] |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:51
|
Update of /cvsroot/adobe-source/adobe-source/adobe/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/bin Modified Files: asl_net_setup.bat asl_net_setup.sh Log Message: asl 1.0.12 Index: asl_net_setup.bat =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/asl_net_setup.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** asl_net_setup.bat 2 Dec 2005 02:52:50 -0000 1.5 --- asl_net_setup.bat 6 Jan 2006 18:35:03 -0000 1.6 *************** *** 1,7 **** @ECHO OFF ! set ASL_DISTRO_NAME=asl_1.0.11.zip set ASL_DIR_NAME=adobe-source ! set ASL_DISTRO_HOST=internap.dl.sourceforge.net set CURL_DISTRO_NAME=curl-7.14.0-win32-nossl.zip set CURL_EXE_NAME=curl-7.14.0\curl.exe --- 1,7 ---- @ECHO OFF ! set ASL_DISTRO_NAME=asl_1.0.12.zip set ASL_DIR_NAME=adobe-source ! set ASL_DISTRO_HOST=easynews.dl.sourceforge.net set CURL_DISTRO_NAME=curl-7.14.0-win32-nossl.zip set CURL_EXE_NAME=curl-7.14.0\curl.exe *************** *** 9,14 **** set UNZIP_EXE_NAME=unzip\unzip.exe set LECONV=adobe-source\adobe\bin\leconv.exe ! set BOOST_DISTRO_NAME=boost_1_33_0.zip ! set BOOST_DIR_NAME=boost_1_33_0 set PATCH_DISTRO_NAME=patch-2.5.9-2-bin.zip set PATCH_EXE_NAME=gnuwin32\bin\patch.exe --- 9,14 ---- set UNZIP_EXE_NAME=unzip\unzip.exe set LECONV=adobe-source\adobe\bin\leconv.exe ! set BOOST_DISTRO_NAME=boost_1_33_1.zip ! set BOOST_DIR_NAME=boost_1_33_1 set PATCH_DISTRO_NAME=patch-2.5.9-2-bin.zip set PATCH_EXE_NAME=gnuwin32\bin\patch.exe *************** *** 84,88 **** copy %PATCH_DISTRO_NAME% gnuwin32\ PUSHD gnuwin32\ ! ..\%UNZIP_EXE_NAME% %PATCH_DISTRO_NAME% POPD ) --- 84,88 ---- copy %PATCH_DISTRO_NAME% gnuwin32\ PUSHD gnuwin32\ ! ..\%UNZIP_EXE_NAME% %PATCH_DISTRO_NAME% > nul POPD ) *************** *** 90,107 **** if NOT EXIST %ASL_DIR_NAME% ( echo Extracting ASL distribution... ! %UNZIP_EXE_NAME% %ASL_DISTRO_NAME% ) if NOT EXIST adobe-source\third_party\boost_tp\%BOOST_DIR_NAME% ( ! echo Setting up destination Boost directory... ! %UNZIP_EXE_NAME% %BOOST_DISTRO_NAME% ! %LECONV% %BOOST_DIR_NAME% move %BOOST_DIR_NAME% adobe-source\third_party\boost_tp ) if NOT EXIST adobe-source\third_party\boost_tp\boost ( ! echo Setting up source Boost directory... PUSHD adobe-source\third_party\boost_tp ! xcopy %BOOST_DIR_NAME% boost /S /E /I /Y POPD ) --- 90,106 ---- if NOT EXIST %ASL_DIR_NAME% ( echo Extracting ASL distribution... ! %UNZIP_EXE_NAME% %ASL_DISTRO_NAME% > nul ) if NOT EXIST adobe-source\third_party\boost_tp\%BOOST_DIR_NAME% ( ! echo Setting up destination Boost directory, which could take a while... ! %UNZIP_EXE_NAME% %BOOST_DISTRO_NAME% > nul move %BOOST_DIR_NAME% adobe-source\third_party\boost_tp ) if NOT EXIST adobe-source\third_party\boost_tp\boost ( ! echo Setting up source Boost directory, which could take a while... PUSHD adobe-source\third_party\boost_tp ! xcopy %BOOST_DIR_NAME% boost /S /E /I /Y > nul POPD ) Index: asl_net_setup.sh =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/bin/asl_net_setup.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** asl_net_setup.sh 2 Dec 2005 02:52:50 -0000 1.5 --- asl_net_setup.sh 6 Jan 2006 18:35:04 -0000 1.6 *************** *** 1,7 **** #!/bin/bash ! ASL_DISTRO_NAME=asl_1.0.11.tgz ! ASL_DISTRO_SITE=internap.dl.sourceforge.net ! BOOST_NAME=boost_1_33_0 BOOST_DISTRO_NAME="$BOOST_NAME".tar.gz --- 1,7 ---- #!/bin/bash ! ASL_DISTRO_NAME=asl_1.0.12.tgz ! ASL_DISTRO_SITE=easynews.dl.sourceforge.net ! BOOST_NAME=boost_1_33_1 BOOST_DISTRO_NAME="$BOOST_NAME".tar.gz |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:45
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin/boost_filesystem.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin/boost_filesystem.xcodeproj Added Files: project.pbxproj Log Message: asl 1.0.12 --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 42; objects = { /* Begin PBXBuildFile section */ CE5C200F0947972100EB4BB6 /* convenience.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C200B0947972100EB4BB6 /* convenience.cpp */; }; CE5C20100947972100EB4BB6 /* exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C200C0947972100EB4BB6 /* exception.cpp */; }; CE5C20110947972100EB4BB6 /* operations_posix_windows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C200D0947972100EB4BB6 /* operations_posix_windows.cpp */; }; CE5C20120947972100EB4BB6 /* path_posix_windows.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C200E0947972100EB4BB6 /* path_posix_windows.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ 014CEA520018CE5811CA2923 /* Debug */ = { isa = PBXBuildStyle; buildSettings = { }; name = Debug; }; 014CEA530018CE5811CA2923 /* Release */ = { isa = PBXBuildStyle; buildSettings = { }; name = Release; }; /* End PBXBuildStyle section */ /* Begin PBXFileReference section */ CE5C200B0947972100EB4BB6 /* convenience.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = convenience.cpp; path = ../../third_party/boost_tp/boost/libs/filesystem/src/convenience.cpp; sourceTree = SOURCE_ROOT; }; CE5C200C0947972100EB4BB6 /* exception.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = exception.cpp; path = ../../third_party/boost_tp/boost/libs/filesystem/src/exception.cpp; sourceTree = SOURCE_ROOT; }; CE5C200D0947972100EB4BB6 /* operations_posix_windows.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = operations_posix_windows.cpp; path = ../../third_party/boost_tp/boost/libs/filesystem/src/operations_posix_windows.cpp; sourceTree = SOURCE_ROOT; }; CE5C200E0947972100EB4BB6 /* path_posix_windows.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = path_posix_windows.cpp; path = ../../third_party/boost_tp/boost/libs/filesystem/src/path_posix_windows.cpp; sourceTree = SOURCE_ROOT; }; CE5C20140947973700EB4BB6 /* adobe_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_debug.xcconfig; sourceTree = "<group>"; }; CE5C20150947973700EB4BB6 /* adobe_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_release.xcconfig; sourceTree = "<group>"; }; CE5C20160947973700EB4BB6 /* boost_all.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = boost_all.xcconfig; sourceTree = "<group>"; }; D2AAC046055464E500DB518D /* libboost_filesystem.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboost_filesystem.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 08FB7794FE84155DC02AAC07 /* boost_filesystem */ = { isa = PBXGroup; children = ( CE5C1FC10947908500EB4BB6 /* xcconfigs */, 08FB7795FE84155DC02AAC07 /* Source */, C6A0FF2B0290797F04C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = boost_filesystem; sourceTree = "<group>"; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( CE5C200B0947972100EB4BB6 /* convenience.cpp */, CE5C200C0947972100EB4BB6 /* exception.cpp */, CE5C200D0947972100EB4BB6 /* operations_posix_windows.cpp */, CE5C200E0947972100EB4BB6 /* path_posix_windows.cpp */, ); name = Source; sourceTree = "<group>"; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libboost_filesystem.a */, ); name = Products; sourceTree = "<group>"; }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( ); name = Documentation; sourceTree = "<group>"; }; CE5C1FC10947908500EB4BB6 /* xcconfigs */ = { isa = PBXGroup; children = ( CE5C20140947973700EB4BB6 /* adobe_debug.xcconfig */, CE5C20150947973700EB4BB6 /* adobe_release.xcconfig */, CE5C20160947973700EB4BB6 /* boost_all.xcconfig */, ); name = xcconfigs; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ D2AAC045055464E500DB518D /* boost_filesystem */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "boost_filesystem" */; buildPhases = ( D2AAC043055464E500DB518D /* Headers */, D2AAC044055464E500DB518D /* Sources */, D289987405E68DCB004EDB86 /* Frameworks */, ); buildRules = ( ); buildSettings = { }; dependencies = ( ); name = boost_filesystem; productName = boost_filesystem; productReference = D2AAC046055464E500DB518D /* libboost_filesystem.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boost_filesystem" */; buildSettings = { }; buildStyles = ( 014CEA520018CE5811CA2923 /* Debug */, 014CEA530018CE5811CA2923 /* Release */, ); hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* boost_filesystem */; projectDirPath = ""; targets = ( D2AAC045055464E500DB518D /* boost_filesystem */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C200F0947972100EB4BB6 /* convenience.cpp in Sources */, CE5C20100947972100EB4BB6 /* exception.cpp in Sources */, CE5C20110947972100EB4BB6 /* operations_posix_windows.cpp in Sources */, CE5C20120947972100EB4BB6 /* path_posix_windows.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C20140947973700EB4BB6 /* adobe_debug.xcconfig */; buildSettings = { COPY_PHASE_STRIP = NO; PRODUCT_NAME = boost_filesystem; }; name = Debug; }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C20150947973700EB4BB6 /* adobe_release.xcconfig */; buildSettings = { PRODUCT_NAME = boost_filesystem; }; name = Release; }; 1DEB91F008733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C20160947973700EB4BB6 /* boost_all.xcconfig */; buildSettings = { }; name = Debug; }; 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C20160947973700EB4BB6 /* boost_all.xcconfig */; buildSettings = { }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "boost_filesystem" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91EC08733DB70010E9CD /* Debug */, 1DEB91ED08733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boost_filesystem" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91F008733DB70010E9CD /* Debug */, 1DEB91F108733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; } |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:45
|
Update of /cvsroot/adobe-source/adobe-source/adobe/config/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/config/compiler Modified Files: gcc.hpp visualc.hpp Log Message: asl 1.0.12 Index: gcc.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/config/compiler/gcc.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gcc.hpp 2 Dec 2005 02:52:50 -0000 1.1 --- gcc.hpp 6 Jan 2006 18:35:07 -0000 1.2 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) Index: visualc.hpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/config/compiler/visualc.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** visualc.hpp 2 Dec 2005 02:52:50 -0000 1.1 --- visualc.hpp 6 Jan 2006 18:35:07 -0000 1.2 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:44
|
Update of /cvsroot/adobe-source/adobe-source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808 Modified Files: Jamfile.v2 project-root.jam read_me.txt release_notes.txt Log Message: asl 1.0.12 Index: Jamfile.v2 =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/Jamfile.v2,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Jamfile.v2 2 Dec 2005 02:52:49 -0000 1.6 --- Jamfile.v2 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 28,31 **** --- 28,32 ---- <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE <toolset>darwin:<cxxflags>"-Werror" + <toolset>gcc,<variant>debug:<cxxflags>"-Werror" $(ARCH) : default-build *************** *** 55,63 **** } ! alias asl : adobe/build//asl ; ! alias asl_dev : adobe/build//asl_dev ; alias adam_smoke : adobe/test/adam_smoke : <variant>debug ; alias adam_tutorial : adobe/test/adam_tutorial ; alias eve_smoke : adobe/test/eve_smoke ; alias md5 : adobe/test/md5 ; alias sha : adobe/test/sha ; --- 56,67 ---- } ! ! alias asl : adobe//asl ; ! alias asl_dev : adobe//asl_dev ; alias adam_smoke : adobe/test/adam_smoke : <variant>debug ; alias adam_tutorial : adobe/test/adam_tutorial ; alias eve_smoke : adobe/test/eve_smoke ; + alias forest_smoke : adobe/test/forest_smoke ; + alias gil : adobe/test/gil ; alias md5 : adobe/test/md5 ; alias sha : adobe/test/sha ; Index: read_me.txt =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/read_me.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** read_me.txt 2 Dec 2005 02:52:49 -0000 1.15 --- read_me.txt 6 Jan 2006 18:35:02 -0000 1.16 *************** *** 1,3 **** ! Build Instructions 20051201 --- 1,3 ---- ! Build Instructions 20060105 *************** *** 32,41 **** ! Boost 1.33.0 is not included as part of the ASL distribution. You must first download it from: http://sourceforge.net/project/showfiles.php?group_id=7586 ! Then you will need to patch Boost 1.33.0 before compiling. Decompress the downloaded file and move the resulting directory to: --- 32,41 ---- ! Boost 1.33.1 is not included as part of the ASL distribution. You must first download it from: http://sourceforge.net/project/showfiles.php?group_id=7586 ! Then you will need to patch Boost 1.33.1 before compiling. Decompress the downloaded file and move the resulting directory to: *************** *** 50,54 **** A patchfile with those changes can be found at: ! ~/adobe-source/third_party/boost_tp/adobe/boost_1_33_0_patch_01.txt You can use the Unix patch command to make the necessary changes, but --- 50,54 ---- A patchfile with those changes can be found at: ! ~/adobe-source/third_party/boost_tp/adobe/boost_1_33_1_patch_01.txt You can use the Unix patch command to make the necessary changes, but *************** *** 87,91 **** Note that the contents of the adobe directory are obtained through the ASL distribution, while the boost directory contains a patched release ! of boost 1.33.0. Building the ASL libraries is handled through a build script that will --- 87,91 ---- Note that the contents of the adobe directory are obtained through the ASL distribution, while the boost directory contains a patched release ! of boost 1.33.1. Building the ASL libraries is handled through a build script that will *************** *** 155,165 **** ! Building on Mac OS X, Cygwin, Linux, and other *nix Flavors ! ----------------------------------------------------------- ! The Adobe Source Libraries have been compiled and tested under CW 9.6, ! GCC 3.3.x and GCC 4.0.1. Assuming you have installed ASL to your home ! directory, the directory structure for setting up a build is as follows: ~/adobe-source/adobe/ --- 155,165 ---- ! Building on Mac OS X, Cygwin, Linux, and other *nix Flavors (cmd line) ! ---------------------------------------------------------------------- ! The Adobe Source Libraries have been compiled and tested under GCC 3.3.x ! and GCC 4.0.1. Assuming you have installed ASL to your home directory, ! the directory structure for setting up a build is as follows: ~/adobe-source/adobe/ *************** *** 168,172 **** Note that the contents of the adobe directory are obtained through the ASL distribution, while the boost directory contains a patched release ! of boost 1.33.0. Building the ASL libraries is handled through a build script that will --- 168,172 ---- Note that the contents of the adobe directory are obtained through the ASL distribution, while the boost directory contains a patched release ! of boost 1.33.1. Building the ASL libraries is handled through a build script that will *************** *** 259,262 **** --- 259,272 ---- + IDE projects for XCode 2.2 have been added for all the related + components needed to build ASL (including Boost). They can be found in + + ~/adobe-source/ide_projects/darwin/ + + To build Adobe Begin with the XCode projects just open the + begin.xcodeproj file and begin the build. All dependencies will be built + as well. Note that in order to build with XCode you must first have + patched your Boost distribution with the latest ASL patches. + As of Mac OS X 10.4.x (Tiger) using XCode 2.1, it is possible for gcc 4.0 to compile binaries which are simultaneously compatible with *************** *** 450,454 **** ~/adobe-source/adobe/test/begin/examples/ ! To build Adobe Begin yourself you will need CodeWarrior 9.5 or XCode for MacOS X, or MSVC 7.1 on Windows (not Cygwin). You will also need to have the proper directory structure in place (see above). --- 460,464 ---- ~/adobe-source/adobe/test/begin/examples/ ! To build Adobe Begin yourself you will need XCode 2.2 or later for MacOS X, or MSVC 7.1 on Windows (not Cygwin). You will also need to have the proper directory structure in place (see above). Index: project-root.jam =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/project-root.jam,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project-root.jam 6 Oct 2005 20:43:11 -0000 1.3 --- project-root.jam 6 Jan 2006 18:35:02 -0000 1.4 *************** *** 3,7 **** use-project /boost : third_party/boost_tp/boost ; ! use-project /adobe : adobe/build ; use-project /adobe/adobe_widgets : adobe/future/widgets ; use-project /adobe/begin : adobe/test/begin ; --- 3,7 ---- use-project /boost : third_party/boost_tp/boost ; ! use-project /adobe : adobe/ ; use-project /adobe/adobe_widgets : adobe/future/widgets ; use-project /adobe/begin : adobe/test/begin ; Index: release_notes.txt =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/release_notes.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** release_notes.txt 2 Dec 2005 02:52:49 -0000 1.6 --- release_notes.txt 6 Jan 2006 18:35:02 -0000 1.7 *************** *** 1,3 **** ! Release Notes 20051201 --- 1,3 ---- ! Release Notes 20060105 *************** *** 6,9 **** --- 6,88 ---- ================ + 2006/01/05 + - Added the Generic Image Library (GIL). This library allows for + writing generic imaging algorithms with performance comparable to + hand-coding for a particular image type. + - Lubomir has been hard at work getting the GIL tutorial and design + guide ready for release. We anticipate it within a couple weeks; + hang in there. + - Begin handles line endings a little better now. It accepts all + three common line ending formats and converts all of them to the + line ending for the current platform upon read-in and saving the + Adam or Eve file. + - The text in an edit_text widget now takes more than 1023 + characters (by Thomas Witt) + - The edit_text widget now grows vertically (by Thomas Witt) + - Added forest_smoke as a test framework for adobe::forest + - Metrowerks CodeWarrior support has been completely dropped for + this release. Consequently this allowed for a lot of directory and + file clean-up. + - Improved Adam error reporting. + - Save button semantics in Adobe Begin have been changed so you can + now save the modifications without first having to push the update + button. (by Thomas Witt) + - IDE projects were reworked and added back in to the ASL + distribution. Most notably, both the MSVC 8 and XCode 2.2 projects + take advantage of features in these IDEs to specify common + settings in files external to the projects themselves. This allows + for increased consistency and compatibility between projects. + - Warning-as-error compilation settings turned back on; removed + deprecated warnings for the time being + - cmd_system now requires every command be unique. Fixed up the APIs + to reflect that. + - ASL now compiles against Boost 1.33.1. The old 1.33.0 patchfile + has been removed, and a 1.33.1 patchfile has been started. + - Patch Boost's cast.hpp for VS 2003 (Not needed for VS 2005) + - Other bugs squashed and code enhancements + - Multiple documentation tweaks and enhancements + - Major rework of <adobe/forest.hpp>. I'm hoping one more pass for + the next release and forest.hpp will be complete. + - preorder and postorder iterator adaptors collapsed into a + single edge_iterator<> adaptor. + - fullorder iterator interface changed + - depth() moved into a separate iterator adaptor, this makes + fullorder iterators significantly less expensive. + - leading() replaced by edge() which return + forest_leading_edge (1) or forest_trailing_edge (0). + - set_leading() replaced with assignment to edge(). + _ pivot() removed (can use edge() ^= 1 to pivot). + - reverse_fullorder_cursor reworked to be fully symmetric. See + discussion at: + <http://opensource.adobe.com/twiki/bin/view/AdobeSource/ForestEdge> + - added depth_fullorder_cursor adaptor which provides the old + depth() feature to any fullorder iterator. + - Changed implementation to make use of + <adobe/iterator/set_next.hpp> which greatly simplifies the + implementation and allows for developing generic node based + algorithms. + - Allow set_next() for forest::iterator and + forest::child_iterator. + - Added support for copy-construction, assignment, and equality- + comparison for forest. + - Added max_size(), empty(), and clear() member functions. + - Added a root() member function which return an iterator. + root() cannot be dereferenced but can be used with set_next(). + - Fixed a bug with the result of erase(). + - Added insert() which can insert a complete sub-forest. + - Fixed several bugs with splice and added a result iterator + to the spliced in elements (similar to insert). + - Greatly improved the size() invalidation logic for splice(). + - Added a size_valid() member function which can be used to + determine if size() will execute in O(1) or O(N) time. + - Added a variant of splice which excepts a distance for the + provided range to eliminate many cases where size would be + invalidated. + - Added a result to insert_parent() to return an iterator to the + inserted element. + - Added a reverse() member function which can reverse any + sub-forest in the forest. + - An empty forest no longer performs a heap allocation. + - Added helper functions to construct reversed or depth ranges. 2005/12/01 |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:44
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/xstr_test/bindebug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/xstr_test/bindebug Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:44
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin/boost_threads.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin/boost_threads.xcodeproj Added Files: project.pbxproj Log Message: asl 1.0.12 --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 42; objects = { /* Begin PBXBuildFile section */ CE5C2074094798EE00EB4BB6 /* barrier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2068094798EE00EB4BB6 /* barrier.cpp */; }; CE5C2075094798EE00EB4BB6 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2069094798EE00EB4BB6 /* condition.cpp */; }; CE5C2076094798EE00EB4BB6 /* exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C206A094798EE00EB4BB6 /* exceptions.cpp */; }; CE5C2077094798EE00EB4BB6 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C206B094798EE00EB4BB6 /* mutex.cpp */; }; CE5C2078094798EE00EB4BB6 /* once.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C206C094798EE00EB4BB6 /* once.cpp */; }; CE5C2079094798EE00EB4BB6 /* recursive_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C206D094798EE00EB4BB6 /* recursive_mutex.cpp */; }; CE5C207A094798EE00EB4BB6 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C206E094798EE00EB4BB6 /* thread.cpp */; }; CE5C207B094798EE00EB4BB6 /* tss_dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C206F094798EE00EB4BB6 /* tss_dll.cpp */; }; CE5C207C094798EE00EB4BB6 /* tss_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2070094798EE00EB4BB6 /* tss_hooks.cpp */; }; CE5C207D094798EE00EB4BB6 /* tss_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2071094798EE00EB4BB6 /* tss_pe.cpp */; }; CE5C207E094798EE00EB4BB6 /* tss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2072094798EE00EB4BB6 /* tss.cpp */; }; CE5C207F094798EE00EB4BB6 /* xtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2073094798EE00EB4BB6 /* xtime.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ 014CEA520018CE5811CA2923 /* Debug */ = { isa = PBXBuildStyle; buildSettings = { }; name = Debug; }; 014CEA530018CE5811CA2923 /* Release */ = { isa = PBXBuildStyle; buildSettings = { }; name = Release; }; /* End PBXBuildStyle section */ /* Begin PBXFileReference section */ CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_debug.xcconfig; sourceTree = "<group>"; }; CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_release.xcconfig; sourceTree = "<group>"; }; CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = boost_all.xcconfig; sourceTree = "<group>"; }; CE5C2068094798EE00EB4BB6 /* barrier.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = barrier.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/barrier.cpp; sourceTree = SOURCE_ROOT; }; CE5C2069094798EE00EB4BB6 /* condition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = condition.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/condition.cpp; sourceTree = SOURCE_ROOT; }; CE5C206A094798EE00EB4BB6 /* exceptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = exceptions.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/exceptions.cpp; sourceTree = SOURCE_ROOT; }; CE5C206B094798EE00EB4BB6 /* mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = mutex.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/mutex.cpp; sourceTree = SOURCE_ROOT; }; CE5C206C094798EE00EB4BB6 /* once.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = once.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/once.cpp; sourceTree = SOURCE_ROOT; }; CE5C206D094798EE00EB4BB6 /* recursive_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = recursive_mutex.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/recursive_mutex.cpp; sourceTree = SOURCE_ROOT; }; CE5C206E094798EE00EB4BB6 /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = thread.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/thread.cpp; sourceTree = SOURCE_ROOT; }; CE5C206F094798EE00EB4BB6 /* tss_dll.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tss_dll.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/tss_dll.cpp; sourceTree = SOURCE_ROOT; }; CE5C2070094798EE00EB4BB6 /* tss_hooks.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tss_hooks.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/tss_hooks.cpp; sourceTree = SOURCE_ROOT; }; CE5C2071094798EE00EB4BB6 /* tss_pe.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tss_pe.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/tss_pe.cpp; sourceTree = SOURCE_ROOT; }; CE5C2072094798EE00EB4BB6 /* tss.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = tss.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/tss.cpp; sourceTree = SOURCE_ROOT; }; CE5C2073094798EE00EB4BB6 /* xtime.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xtime.cpp; path = ../../third_party/boost_tp/boost/libs/thread/src/xtime.cpp; sourceTree = SOURCE_ROOT; }; D2AAC046055464E500DB518D /* libboost_threads.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboost_threads.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 08FB7794FE84155DC02AAC07 /* boost_signals */ = { isa = PBXGroup; children = ( CE5C1FF1094795E800EB4BB6 /* xcconfigs */, 08FB7795FE84155DC02AAC07 /* Source */, C6A0FF2B0290797F04C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = boost_signals; sourceTree = "<group>"; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( CE5C2068094798EE00EB4BB6 /* barrier.cpp */, CE5C2069094798EE00EB4BB6 /* condition.cpp */, CE5C206A094798EE00EB4BB6 /* exceptions.cpp */, CE5C206B094798EE00EB4BB6 /* mutex.cpp */, CE5C206C094798EE00EB4BB6 /* once.cpp */, CE5C206D094798EE00EB4BB6 /* recursive_mutex.cpp */, CE5C206E094798EE00EB4BB6 /* thread.cpp */, CE5C206F094798EE00EB4BB6 /* tss_dll.cpp */, CE5C2070094798EE00EB4BB6 /* tss_hooks.cpp */, CE5C2071094798EE00EB4BB6 /* tss_pe.cpp */, CE5C2072094798EE00EB4BB6 /* tss.cpp */, CE5C2073094798EE00EB4BB6 /* xtime.cpp */, ); name = Source; sourceTree = "<group>"; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libboost_threads.a */, ); name = Products; sourceTree = "<group>"; }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( ); name = Documentation; sourceTree = "<group>"; }; CE5C1FF1094795E800EB4BB6 /* xcconfigs */ = { isa = PBXGroup; children = ( CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */, CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */, CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */, ); name = xcconfigs; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ D2AAC045055464E500DB518D /* boost_threads */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "boost_threads" */; buildPhases = ( D2AAC043055464E500DB518D /* Headers */, D2AAC044055464E500DB518D /* Sources */, D289987405E68DCB004EDB86 /* Frameworks */, ); buildRules = ( ); buildSettings = { }; dependencies = ( ); name = boost_threads; productName = boost_signals; productReference = D2AAC046055464E500DB518D /* libboost_threads.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boost_threads" */; buildSettings = { }; buildStyles = ( 014CEA520018CE5811CA2923 /* Debug */, 014CEA530018CE5811CA2923 /* Release */, ); hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* boost_signals */; projectDirPath = ""; targets = ( D2AAC045055464E500DB518D /* boost_threads */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C2074094798EE00EB4BB6 /* barrier.cpp in Sources */, CE5C2075094798EE00EB4BB6 /* condition.cpp in Sources */, CE5C2076094798EE00EB4BB6 /* exceptions.cpp in Sources */, CE5C2077094798EE00EB4BB6 /* mutex.cpp in Sources */, CE5C2078094798EE00EB4BB6 /* once.cpp in Sources */, CE5C2079094798EE00EB4BB6 /* recursive_mutex.cpp in Sources */, CE5C207A094798EE00EB4BB6 /* thread.cpp in Sources */, CE5C207B094798EE00EB4BB6 /* tss_dll.cpp in Sources */, CE5C207C094798EE00EB4BB6 /* tss_hooks.cpp in Sources */, CE5C207D094798EE00EB4BB6 /* tss_pe.cpp in Sources */, CE5C207E094798EE00EB4BB6 /* tss.cpp in Sources */, CE5C207F094798EE00EB4BB6 /* xtime.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", "BOOST_SIGNALS_NO_LIB=1", ); }; name = Debug; }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", "$(ADOBE_RELEASE_PREPROCESSOR_DEFINITIONS)", "BOOST_SIGNALS_NO_LIB=1", ); }; name = Release; }; 1DEB91F008733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */; buildSettings = { PRODUCT_NAME = boost_threads; }; name = Debug; }; 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */; buildSettings = { PRODUCT_NAME = boost_threads; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "boost_threads" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91EC08733DB70010E9CD /* Debug */, 1DEB91ED08733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boost_threads" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91F008733DB70010E9CD /* Debug */, 1DEB91F108733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; } |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:43
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/eve_smoke/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/eve_smoke/bin Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:43
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/md5/bindebug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/md5/bindebug Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:41
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin/asl_dev.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin/asl_dev.xcodeproj Added Files: project.pbxproj Log Message: asl 1.0.12 --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 42; objects = { /* Begin PBXBuildFile section */ CE5C20F509479C0200EB4BB6 /* adam_evaluate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20D609479C0200EB4BB6 /* adam_evaluate.cpp */; }; CE5C20F609479C0200EB4BB6 /* adam_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20D709479C0200EB4BB6 /* adam_parser.cpp */; }; CE5C20F709479C0200EB4BB6 /* adam.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20D809479C0200EB4BB6 /* adam.cpp */; }; CE5C20F809479C0200EB4BB6 /* array.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20D909479C0200EB4BB6 /* array.cpp */; }; CE5C20F909479C0200EB4BB6 /* dictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20DA09479C0200EB4BB6 /* dictionary.cpp */; }; CE5C20FA09479C0200EB4BB6 /* eve_evaluate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20DB09479C0200EB4BB6 /* eve_evaluate.cpp */; }; CE5C20FB09479C0200EB4BB6 /* eve_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20DC09479C0200EB4BB6 /* eve_parser.cpp */; }; CE5C20FC09479C0200EB4BB6 /* eve.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20DD09479C0200EB4BB6 /* eve.cpp */; }; CE5C20FD09479C0200EB4BB6 /* expression_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20DE09479C0200EB4BB6 /* expression_parser.cpp */; }; CE5C20FE09479C0200EB4BB6 /* extents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20DF09479C0200EB4BB6 /* extents.cpp */; }; CE5C20FF09479C0200EB4BB6 /* istream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E009479C0200EB4BB6 /* istream.cpp */; }; CE5C210009479C0200EB4BB6 /* lex_shared.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E109479C0200EB4BB6 /* lex_shared.cpp */; }; CE5C210109479C0200EB4BB6 /* lex_stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E209479C0200EB4BB6 /* lex_stream.cpp */; }; CE5C210209479C0200EB4BB6 /* md5.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E309479C0200EB4BB6 /* md5.cpp */; }; CE5C210309479C0200EB4BB6 /* name.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E409479C0200EB4BB6 /* name.cpp */; }; CE5C210409479C0200EB4BB6 /* parser_shared.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E509479C0200EB4BB6 /* parser_shared.cpp */; }; CE5C210509479C0200EB4BB6 /* string_pool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E609479C0200EB4BB6 /* string_pool.cpp */; }; CE5C210609479C0200EB4BB6 /* test_configuration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E709479C0200EB4BB6 /* test_configuration.cpp */; }; CE5C210709479C0200EB4BB6 /* thread_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E809479C0200EB4BB6 /* thread_id.cpp */; }; CE5C210809479C0200EB4BB6 /* token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20E909479C0200EB4BB6 /* token.cpp */; }; CE5C210909479C0200EB4BB6 /* typeinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20EA09479C0200EB4BB6 /* typeinfo.cpp */; }; CE5C210A09479C0200EB4BB6 /* unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20EB09479C0200EB4BB6 /* unicode.cpp */; }; CE5C210B09479C0200EB4BB6 /* value.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20EC09479C0200EB4BB6 /* value.cpp */; }; CE5C210C09479C0200EB4BB6 /* virtual_machine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20ED09479C0200EB4BB6 /* virtual_machine.cpp */; }; CE5C210D09479C0200EB4BB6 /* xml_element_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20EE09479C0200EB4BB6 /* xml_element_parser.cpp */; }; CE5C210E09479C0200EB4BB6 /* xml_lex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20EF09479C0200EB4BB6 /* xml_lex.cpp */; }; CE5C210F09479C0200EB4BB6 /* xml_token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20F009479C0200EB4BB6 /* xml_token.cpp */; }; CE5C211009479C0200EB4BB6 /* xstring.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20F109479C0200EB4BB6 /* xstring.cpp */; }; CE5C211109479C0200EB4BB6 /* zuid_sys_dep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20F209479C0200EB4BB6 /* zuid_sys_dep.cpp */; }; CE5C211209479C0200EB4BB6 /* zuid_uuid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20F309479C0200EB4BB6 /* zuid_uuid.cpp */; }; CE5C211309479C0200EB4BB6 /* zuid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20F409479C0200EB4BB6 /* zuid.cpp */; }; CEC069EA0948A52200AFC610 /* libboost_filesystem.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC069DB0948A50F00AFC610 /* libboost_filesystem.a */; }; CEC069EB0948A52200AFC610 /* libboost_signals.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC069DF0948A50F00AFC610 /* libboost_signals.a */; }; CEC069EC0948A52200AFC610 /* libboost_threads.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC069E30948A50F00AFC610 /* libboost_threads.a */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ 014CEA520018CE5811CA2923 /* Debug */ = { isa = PBXBuildStyle; buildSettings = { }; name = Debug; }; 014CEA530018CE5811CA2923 /* Release */ = { isa = PBXBuildStyle; buildSettings = { }; name = Release; }; /* End PBXBuildStyle section */ /* Begin PBXContainerItemProxy section */ CEC069DA0948A50F00AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069CF0948A50F00AFC610 /* boost_filesystem.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC046055464E500DB518D /* libboost_filesystem.a */; remoteInfo = boost_filesystem; }; CEC069DE0948A50F00AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069D20948A50F00AFC610 /* boost_signals.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC046055464E500DB518D /* libboost_signals.a */; remoteInfo = boost_signals; }; CEC069E20948A50F00AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069D50948A50F00AFC610 /* boost_threads.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC046055464E500DB518D /* libboost_threads.a */; remoteInfo = boost_threads; }; CEC069E40948A51600AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069D20948A50F00AFC610 /* boost_signals.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC045055464E500DB518D /* boost_signals */; remoteInfo = boost_signals; }; CEC069E60948A51600AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069D50948A50F00AFC610 /* boost_threads.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC045055464E500DB518D /* boost_threads */; remoteInfo = boost_threads; }; CEC069E80948A51600AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069CF0948A50F00AFC610 /* boost_filesystem.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC045055464E500DB518D /* boost_filesystem */; remoteInfo = boost_filesystem; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_debug.xcconfig; sourceTree = "<group>"; }; CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_release.xcconfig; sourceTree = "<group>"; }; CE5C20BC09479BAA00EB4BB6 /* asl_dev_all.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = asl_dev_all.xcconfig; sourceTree = "<group>"; }; CE5C20D609479C0200EB4BB6 /* adam_evaluate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = adam_evaluate.cpp; path = ../../adobe/source/adam_evaluate.cpp; sourceTree = SOURCE_ROOT; }; CE5C20D709479C0200EB4BB6 /* adam_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = adam_parser.cpp; path = ../../adobe/source/adam_parser.cpp; sourceTree = SOURCE_ROOT; }; CE5C20D809479C0200EB4BB6 /* adam.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = adam.cpp; path = ../../adobe/source/adam.cpp; sourceTree = SOURCE_ROOT; }; CE5C20D909479C0200EB4BB6 /* array.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = array.cpp; path = ../../adobe/source/array.cpp; sourceTree = SOURCE_ROOT; }; CE5C20DA09479C0200EB4BB6 /* dictionary.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = dictionary.cpp; path = ../../adobe/source/dictionary.cpp; sourceTree = SOURCE_ROOT; }; CE5C20DB09479C0200EB4BB6 /* eve_evaluate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = eve_evaluate.cpp; path = ../../adobe/source/eve_evaluate.cpp; sourceTree = SOURCE_ROOT; }; CE5C20DC09479C0200EB4BB6 /* eve_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = eve_parser.cpp; path = ../../adobe/source/eve_parser.cpp; sourceTree = SOURCE_ROOT; }; CE5C20DD09479C0200EB4BB6 /* eve.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = eve.cpp; path = ../../adobe/source/eve.cpp; sourceTree = SOURCE_ROOT; }; CE5C20DE09479C0200EB4BB6 /* expression_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = expression_parser.cpp; path = ../../adobe/source/expression_parser.cpp; sourceTree = SOURCE_ROOT; }; CE5C20DF09479C0200EB4BB6 /* extents.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = extents.cpp; path = ../../adobe/source/extents.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E009479C0200EB4BB6 /* istream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = istream.cpp; path = ../../adobe/source/istream.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E109479C0200EB4BB6 /* lex_shared.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = lex_shared.cpp; path = ../../adobe/source/lex_shared.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E209479C0200EB4BB6 /* lex_stream.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = lex_stream.cpp; path = ../../adobe/source/lex_stream.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E309479C0200EB4BB6 /* md5.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = md5.cpp; path = ../../adobe/source/md5.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E409479C0200EB4BB6 /* name.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = name.cpp; path = ../../adobe/source/name.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E509479C0200EB4BB6 /* parser_shared.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = parser_shared.cpp; path = ../../adobe/source/parser_shared.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E609479C0200EB4BB6 /* string_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = string_pool.cpp; path = ../../adobe/source/string_pool.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E709479C0200EB4BB6 /* test_configuration.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = test_configuration.cpp; path = ../../adobe/source/test_configuration.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E809479C0200EB4BB6 /* thread_id.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = thread_id.cpp; path = ../../adobe/source/thread_id.cpp; sourceTree = SOURCE_ROOT; }; CE5C20E909479C0200EB4BB6 /* token.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = token.cpp; path = ../../adobe/source/token.cpp; sourceTree = SOURCE_ROOT; }; CE5C20EA09479C0200EB4BB6 /* typeinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = typeinfo.cpp; path = ../../adobe/source/typeinfo.cpp; sourceTree = SOURCE_ROOT; }; CE5C20EB09479C0200EB4BB6 /* unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = unicode.cpp; path = ../../adobe/source/unicode.cpp; sourceTree = SOURCE_ROOT; }; CE5C20EC09479C0200EB4BB6 /* value.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = value.cpp; path = ../../adobe/source/value.cpp; sourceTree = SOURCE_ROOT; }; CE5C20ED09479C0200EB4BB6 /* virtual_machine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = virtual_machine.cpp; path = ../../adobe/source/virtual_machine.cpp; sourceTree = SOURCE_ROOT; }; CE5C20EE09479C0200EB4BB6 /* xml_element_parser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xml_element_parser.cpp; path = ../../adobe/source/xml_element_parser.cpp; sourceTree = SOURCE_ROOT; }; CE5C20EF09479C0200EB4BB6 /* xml_lex.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xml_lex.cpp; path = ../../adobe/source/xml_lex.cpp; sourceTree = SOURCE_ROOT; }; CE5C20F009479C0200EB4BB6 /* xml_token.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xml_token.cpp; path = ../../adobe/source/xml_token.cpp; sourceTree = SOURCE_ROOT; }; CE5C20F109479C0200EB4BB6 /* xstring.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = xstring.cpp; path = ../../adobe/source/xstring.cpp; sourceTree = SOURCE_ROOT; }; CE5C20F209479C0200EB4BB6 /* zuid_sys_dep.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = zuid_sys_dep.cpp; path = ../../adobe/source/zuid_sys_dep.cpp; sourceTree = SOURCE_ROOT; }; CE5C20F309479C0200EB4BB6 /* zuid_uuid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = zuid_uuid.cpp; path = ../../adobe/source/zuid_uuid.cpp; sourceTree = SOURCE_ROOT; }; CE5C20F409479C0200EB4BB6 /* zuid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = zuid.cpp; path = ../../adobe/source/zuid.cpp; sourceTree = SOURCE_ROOT; }; CEC069CF0948A50F00AFC610 /* boost_filesystem.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = boost_filesystem.xcodeproj; sourceTree = "<group>"; }; CEC069D20948A50F00AFC610 /* boost_signals.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = boost_signals.xcodeproj; sourceTree = "<group>"; }; CEC069D50948A50F00AFC610 /* boost_threads.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = boost_threads.xcodeproj; sourceTree = "<group>"; }; D2AAC046055464E500DB518D /* libasl_dev.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libasl_dev.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( CEC069EA0948A52200AFC610 /* libboost_filesystem.a in Frameworks */, CEC069EB0948A52200AFC610 /* libboost_signals.a in Frameworks */, CEC069EC0948A52200AFC610 /* libboost_threads.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 08FB7794FE84155DC02AAC07 /* boost_signals */ = { isa = PBXGroup; children = ( CE5C1FF1094795E800EB4BB6 /* xcconfigs */, CEC069CB0948A4F400AFC610 /* asl_projects */, 08FB7795FE84155DC02AAC07 /* Source */, C6A0FF2B0290797F04C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = boost_signals; sourceTree = "<group>"; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( CE5C20D609479C0200EB4BB6 /* adam_evaluate.cpp */, CE5C20D709479C0200EB4BB6 /* adam_parser.cpp */, CE5C20D809479C0200EB4BB6 /* adam.cpp */, CE5C20D909479C0200EB4BB6 /* array.cpp */, CE5C20DA09479C0200EB4BB6 /* dictionary.cpp */, CE5C20DB09479C0200EB4BB6 /* eve_evaluate.cpp */, CE5C20DC09479C0200EB4BB6 /* eve_parser.cpp */, CE5C20DD09479C0200EB4BB6 /* eve.cpp */, CE5C20DE09479C0200EB4BB6 /* expression_parser.cpp */, CE5C20DF09479C0200EB4BB6 /* extents.cpp */, CE5C20E009479C0200EB4BB6 /* istream.cpp */, CE5C20E109479C0200EB4BB6 /* lex_shared.cpp */, CE5C20E209479C0200EB4BB6 /* lex_stream.cpp */, CE5C20E309479C0200EB4BB6 /* md5.cpp */, CE5C20E409479C0200EB4BB6 /* name.cpp */, CE5C20E509479C0200EB4BB6 /* parser_shared.cpp */, CE5C20E609479C0200EB4BB6 /* string_pool.cpp */, CE5C20E709479C0200EB4BB6 /* test_configuration.cpp */, CE5C20E809479C0200EB4BB6 /* thread_id.cpp */, CE5C20E909479C0200EB4BB6 /* token.cpp */, CE5C20EA09479C0200EB4BB6 /* typeinfo.cpp */, CE5C20EB09479C0200EB4BB6 /* unicode.cpp */, CE5C20EC09479C0200EB4BB6 /* value.cpp */, CE5C20ED09479C0200EB4BB6 /* virtual_machine.cpp */, CE5C20EE09479C0200EB4BB6 /* xml_element_parser.cpp */, CE5C20EF09479C0200EB4BB6 /* xml_lex.cpp */, CE5C20F009479C0200EB4BB6 /* xml_token.cpp */, CE5C20F109479C0200EB4BB6 /* xstring.cpp */, CE5C20F209479C0200EB4BB6 /* zuid_sys_dep.cpp */, CE5C20F309479C0200EB4BB6 /* zuid_uuid.cpp */, CE5C20F409479C0200EB4BB6 /* zuid.cpp */, ); name = Source; sourceTree = "<group>"; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libasl_dev.a */, ); name = Products; sourceTree = "<group>"; }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( ); name = Documentation; sourceTree = "<group>"; }; CE5C1FF1094795E800EB4BB6 /* xcconfigs */ = { isa = PBXGroup; children = ( CE5C20BC09479BAA00EB4BB6 /* asl_dev_all.xcconfig */, CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */, CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */, ); name = xcconfigs; sourceTree = "<group>"; }; CEC069CB0948A4F400AFC610 /* asl_projects */ = { isa = PBXGroup; children = ( CEC069CF0948A50F00AFC610 /* boost_filesystem.xcodeproj */, CEC069D20948A50F00AFC610 /* boost_signals.xcodeproj */, CEC069D50948A50F00AFC610 /* boost_threads.xcodeproj */, ); name = asl_projects; sourceTree = "<group>"; }; CEC069D00948A50F00AFC610 /* Products */ = { isa = PBXGroup; children = ( CEC069DB0948A50F00AFC610 /* libboost_filesystem.a */, ); name = Products; sourceTree = "<group>"; }; CEC069D30948A50F00AFC610 /* Products */ = { isa = PBXGroup; children = ( CEC069DF0948A50F00AFC610 /* libboost_signals.a */, ); name = Products; sourceTree = "<group>"; }; CEC069D60948A50F00AFC610 /* Products */ = { isa = PBXGroup; children = ( CEC069E30948A50F00AFC610 /* libboost_threads.a */, ); name = Products; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ D2AAC045055464E500DB518D /* adobe_dev */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "adobe_dev" */; buildPhases = ( D2AAC043055464E500DB518D /* Headers */, D2AAC044055464E500DB518D /* Sources */, D289987405E68DCB004EDB86 /* Frameworks */, ); buildRules = ( ); buildSettings = { }; dependencies = ( CEC069E50948A51600AFC610 /* PBXTargetDependency */, CEC069E70948A51600AFC610 /* PBXTargetDependency */, CEC069E90948A51600AFC610 /* PBXTargetDependency */, ); name = adobe_dev; productName = boost_signals; productReference = D2AAC046055464E500DB518D /* libasl_dev.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "asl_dev" */; buildSettings = { }; buildStyles = ( 014CEA520018CE5811CA2923 /* Debug */, 014CEA530018CE5811CA2923 /* Release */, ); hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* boost_signals */; projectDirPath = ""; projectReferences = ( { ProductGroup = CEC069D00948A50F00AFC610 /* Products */; ProjectRef = CEC069CF0948A50F00AFC610 /* boost_filesystem.xcodeproj */; }, { ProductGroup = CEC069D30948A50F00AFC610 /* Products */; ProjectRef = CEC069D20948A50F00AFC610 /* boost_signals.xcodeproj */; }, { ProductGroup = CEC069D60948A50F00AFC610 /* Products */; ProjectRef = CEC069D50948A50F00AFC610 /* boost_threads.xcodeproj */; }, ); targets = ( D2AAC045055464E500DB518D /* adobe_dev */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ CEC069DB0948A50F00AFC610 /* libboost_filesystem.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libboost_filesystem.a; remoteRef = CEC069DA0948A50F00AFC610 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; CEC069DF0948A50F00AFC610 /* libboost_signals.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libboost_signals.a; remoteRef = CEC069DE0948A50F00AFC610 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; CEC069E30948A50F00AFC610 /* libboost_threads.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libboost_threads.a; remoteRef = CEC069E20948A50F00AFC610 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ /* Begin PBXSourcesBuildPhase section */ D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C20F509479C0200EB4BB6 /* adam_evaluate.cpp in Sources */, CE5C20F609479C0200EB4BB6 /* adam_parser.cpp in Sources */, CE5C20F709479C0200EB4BB6 /* adam.cpp in Sources */, CE5C20F809479C0200EB4BB6 /* array.cpp in Sources */, CE5C20F909479C0200EB4BB6 /* dictionary.cpp in Sources */, CE5C20FA09479C0200EB4BB6 /* eve_evaluate.cpp in Sources */, CE5C20FB09479C0200EB4BB6 /* eve_parser.cpp in Sources */, CE5C20FC09479C0200EB4BB6 /* eve.cpp in Sources */, CE5C20FD09479C0200EB4BB6 /* expression_parser.cpp in Sources */, CE5C20FE09479C0200EB4BB6 /* extents.cpp in Sources */, CE5C20FF09479C0200EB4BB6 /* istream.cpp in Sources */, CE5C210009479C0200EB4BB6 /* lex_shared.cpp in Sources */, CE5C210109479C0200EB4BB6 /* lex_stream.cpp in Sources */, CE5C210209479C0200EB4BB6 /* md5.cpp in Sources */, CE5C210309479C0200EB4BB6 /* name.cpp in Sources */, CE5C210409479C0200EB4BB6 /* parser_shared.cpp in Sources */, CE5C210509479C0200EB4BB6 /* string_pool.cpp in Sources */, CE5C210609479C0200EB4BB6 /* test_configuration.cpp in Sources */, CE5C210709479C0200EB4BB6 /* thread_id.cpp in Sources */, CE5C210809479C0200EB4BB6 /* token.cpp in Sources */, CE5C210909479C0200EB4BB6 /* typeinfo.cpp in Sources */, CE5C210A09479C0200EB4BB6 /* unicode.cpp in Sources */, CE5C210B09479C0200EB4BB6 /* value.cpp in Sources */, CE5C210C09479C0200EB4BB6 /* virtual_machine.cpp in Sources */, CE5C210D09479C0200EB4BB6 /* xml_element_parser.cpp in Sources */, CE5C210E09479C0200EB4BB6 /* xml_lex.cpp in Sources */, CE5C210F09479C0200EB4BB6 /* xml_token.cpp in Sources */, CE5C211009479C0200EB4BB6 /* xstring.cpp in Sources */, CE5C211109479C0200EB4BB6 /* zuid_sys_dep.cpp in Sources */, CE5C211209479C0200EB4BB6 /* zuid_uuid.cpp in Sources */, CE5C211309479C0200EB4BB6 /* zuid.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ CEC069E50948A51600AFC610 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = boost_signals; targetProxy = CEC069E40948A51600AFC610 /* PBXContainerItemProxy */; }; CEC069E70948A51600AFC610 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = boost_threads; targetProxy = CEC069E60948A51600AFC610 /* PBXContainerItemProxy */; }; CEC069E90948A51600AFC610 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = boost_filesystem; targetProxy = CEC069E80948A51600AFC610 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */; buildSettings = { }; name = Debug; }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */; buildSettings = { }; name = Release; }; 1DEB91F008733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C20BC09479BAA00EB4BB6 /* asl_dev_all.xcconfig */; buildSettings = { PRODUCT_NAME = asl_dev; }; name = Debug; }; 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C20BC09479BAA00EB4BB6 /* asl_dev_all.xcconfig */; buildSettings = { PRODUCT_NAME = asl_dev; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "adobe_dev" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91EC08733DB70010E9CD /* Debug */, 1DEB91ED08733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "asl_dev" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91F008733DB70010E9CD /* Debug */, 1DEB91F108733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; } |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:40
|
Update of /cvsroot/adobe-source/adobe-source/third_party/boost_tp/adobe In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/third_party/boost_tp/adobe Modified Files: boost_1_33_1_patch_01.txt patch_boost.sh Removed Files: boost_1_33_0_patch_01.txt Log Message: asl 1.0.12 --- boost_1_33_0_patch_01.txt DELETED --- Index: boost_1_33_1_patch_01.txt =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/third_party/boost_tp/adobe/boost_1_33_1_patch_01.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** boost_1_33_1_patch_01.txt 7 Nov 2005 18:00:46 -0000 1.1 --- boost_1_33_1_patch_01.txt 6 Jan 2006 18:35:28 -0000 1.2 *************** *** 1,44 **** diff -ruN boost_1_33_1/tools/build/v2/tools/darwin.jam boost/tools/build/v2/tools/darwin.jam --- boost_1_33_1/tools/build/v2/tools/darwin.jam 2005-07-15 06:31:13.000000000 -0700 ! +++ boost/tools/build/v2/tools/darwin.jam 2005-11-01 17:05:47.000000000 -0800 ! @@ -40,6 +40,13 @@ ! } feature framework : : free ; +feature isysroot : : free ; + +feature arch : none i386 fat : composite ; # We don't turn on link-incompatible for now; - +#feature.compose <arch>fat : <cxxflags>"-arch i386" <cxxflags>"-arch ppc" ; - +#feature.compose <arch>i386 : <cxxflags>"-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk" ; +flags darwin.compile OPTIONS <arch>fat : -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk ; +flags darwin.compile OPTIONS <arch>i386 : -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk ; ! flags darwin.compile OPTIONS <link>shared : -dynamic ; flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp ; ! @@ -64,6 +71,7 @@ actions piecemeal archive { - ar -c -r -s $(ARFLAGS) "$(<:T)" "$(>:T)" ! +# ar -c -r -s $(ARFLAGS) "$(<:T)" "$(>:T)" ! + libtool -static -o "$(<:T)" $(ARFLAGS) "$(>:T)" } diff -ruN boost_1_33_1/tools/build/v2/tools/gcc.jam boost/tools/build/v2/tools/gcc.jam --- boost_1_33_1/tools/build/v2/tools/gcc.jam 2005-06-15 05:24:06.000000000 -0700 ! +++ boost/tools/build/v2/tools/gcc.jam 2005-11-02 13:50:47.000000000 -0800 ! @@ -237,7 +237,7 @@ # we can't pass -s to ld unless we also pass -static # so we removed -s completly from OPTIONS and add it ! # to ST_OPTIONS - flags $(toolset).link ST_OPTIONS $(condition)/<debug-symbols>off : -s ! + flags $(toolset).link ST_OPTIONS $(condition)/<debug-symbols>off : ! : unchecked ; flags $(toolset).link RPATH $(condition) : <dll-path> : unchecked ; flags $(toolset).link RPATH_LINK $(condition) : <xdll-path> : unchecked ; diff -ruN boost_1_33_1/tools/build/v2/tools/msvc.jam boost/tools/build/v2/tools/msvc.jam --- boost_1_33_1/tools/build/v2/tools/msvc.jam 2005-07-15 06:35:58.000000000 -0700 ! +++ boost/tools/build/v2/tools/msvc.jam 2005-11-02 16:46:29.000000000 -0800 ! @@ -278,10 +278,23 @@ $(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"$(RSP:W)" -c -Fo"$(<[1]:W)" && $(RM) "$(RSP)" } --- 1,136 ---- + diff -ruN boost_1_33_1/boost/date_time/time_resolution_traits.hpp boost/boost/date_time/time_resolution_traits.hpp + --- boost_1_33_1/boost/date_time/time_resolution_traits.hpp 2003-12-02 19:01:05.000000000 -0800 + +++ boost/boost/date_time/time_resolution_traits.hpp 2005-12-06 14:53:43.000000000 -0800 + @@ -120,11 +120,17 @@ + + (fractional_seconds_type(minutes)*60) + + seconds)*res_adjust()) + fs) * -1); + } + - else{ + - return (((fractional_seconds_type(hours)*3600) + - + (fractional_seconds_type(minutes)*60) + - + seconds)*res_adjust()) + fs; + - } + + + + /* ADOBE (fbrereto) : There is a compiler bug in Darwin GCC doing a + + release build that says it is possible to + + reach the end of this function block without + + returning anything. Eliminating the else + + block wrapper fixed the bug. + + */ + + + + return (((fractional_seconds_type(hours)*3600) + + + (fractional_seconds_type(minutes)*60) + + + seconds)*res_adjust()) + fs; + } + + }; + diff -ruN boost_1_33_1/boost/type_traits/detail/bool_trait_def.hpp boost/boost/type_traits/detail/bool_trait_def.hpp + --- boost_1_33_1/boost/type_traits/detail/bool_trait_def.hpp 2005-03-16 04:22:22.000000000 -0800 + +++ boost/boost/type_traits/detail/bool_trait_def.hpp 2005-12-06 14:53:55.000000000 -0800 + @@ -41,6 +41,10 @@ + # define BOOST_TT_AUX_BOOL_C_BASE(C) : ::boost::integral_constant<bool,C> + #endif + + +/* ADOBE (sp...@ad...) : Added undef to avoid multiple define warning in GCC */ + +#ifdef BOOST_TT_AUX_BOOL_TRAIT_DEF1 + +#undef BOOST_TT_AUX_BOOL_TRAIT_DEF1 + +#endif + + #define BOOST_TT_AUX_BOOL_TRAIT_DEF1(trait,T,C) \ + template< typename T > struct trait \ + diff -ruN boost_1_33_1/libs/thread/src/recursive_mutex.cpp boost/libs/thread/src/recursive_mutex.cpp + --- boost_1_33_1/libs/thread/src/recursive_mutex.cpp 2005-03-16 17:55:44.000000000 -0800 + +++ boost/libs/thread/src/recursive_mutex.cpp 2005-12-06 14:54:28.000000000 -0800 + @@ -296,7 +296,13 @@ + + res = pthread_mutex_init(&m_mutex, &attr); + { + - int res = pthread_mutexattr_destroy(&attr); + + // ADOBE (fbrereto) : this fixes an unused variable warning + + // in gcc release builds under darwin. + +# if !defined(NDEBUG) + + int res = + +# endif + + pthread_mutexattr_destroy(&attr); + + + assert(res == 0); + } + if (res != 0) + @@ -452,8 +458,14 @@ + + res = pthread_mutex_init(&m_mutex, &attr); + { + - int res = pthread_mutexattr_destroy(&attr); + - assert(res == 0); + + // ADOBE (fbrereto) : this fixes an unused variable warning + + // in gcc release builds under darwin. + +# if !defined(NDEBUG) + + int res = + +# endif + + pthread_mutexattr_destroy(&attr); + + + + assert(res == 0); + } + if (res != 0) + throw thread_resource_error(); + Binary files boost_1_33_1/tools/build/jam_src/bin.macosxppc/bjam and boost/tools/build/jam_src/bin.macosxppc/bjam differ + Binary files boost_1_33_1/tools/build/jam_src/bootstrap/jam0 and boost/tools/build/jam_src/bootstrap/jam0 differ diff -ruN boost_1_33_1/tools/build/v2/tools/darwin.jam boost/tools/build/v2/tools/darwin.jam --- boost_1_33_1/tools/build/v2/tools/darwin.jam 2005-07-15 06:31:13.000000000 -0700 ! +++ boost/tools/build/v2/tools/darwin.jam 2005-12-06 15:04:35.000000000 -0800 ! @@ -41,6 +41,16 @@ feature framework : : free ; + + +# ADOBE : Adding archtecture variant to build 1386, ppc, or universal binaries + + +feature isysroot : : free ; + +feature arch : none i386 fat : composite ; # We don't turn on link-incompatible for now; +flags darwin.compile OPTIONS <arch>fat : -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk ; +flags darwin.compile OPTIONS <arch>i386 : -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk ; ! + ! +# ADOBE end changes ! + flags darwin.compile OPTIONS <link>shared : -dynamic ; flags darwin.compile OPTIONS : -Wno-long-double -no-cpp-precomp ; ! ! @@ -64,6 +74,10 @@ actions piecemeal archive { - ar -c -r -s $(ARFLAGS) "$(<:T)" "$(>:T)" ! + # ADOBE : We use libtool instead of ar to support universal binary linking ! + ! + libtool -static -o "$(<:T)" $(ARFLAGS) "$(>:T)" ! + ! + # ADOBE end changes } diff -ruN boost_1_33_1/tools/build/v2/tools/gcc.jam boost/tools/build/v2/tools/gcc.jam --- boost_1_33_1/tools/build/v2/tools/gcc.jam 2005-06-15 05:24:06.000000000 -0700 ! +++ boost/tools/build/v2/tools/gcc.jam 2005-12-06 15:02:11.000000000 -0800 ! @@ -236,9 +236,14 @@ ! { # we can't pass -s to ld unless we also pass -static # so we removed -s completly from OPTIONS and add it ! - # to ST_OPTIONS - flags $(toolset).link ST_OPTIONS $(condition)/<debug-symbols>off : -s ! - : unchecked ; ! + # to ST_OPTIONS ! + ! + # ADOBE : XCode 2.2 does not strip properly; removing this setting ! + # until Apple figures out what the problem is ! + #flags $(toolset).link ST_OPTIONS $(condition)/<debug-symbols>off : -s ! + # : unchecked ; ! + # ADOBE end changes ! + flags $(toolset).link RPATH $(condition) : <dll-path> : unchecked ; flags $(toolset).link RPATH_LINK $(condition) : <xdll-path> : unchecked ; + } diff -ruN boost_1_33_1/tools/build/v2/tools/msvc.jam boost/tools/build/v2/tools/msvc.jam --- boost_1_33_1/tools/build/v2/tools/msvc.jam 2005-07-15 06:35:58.000000000 -0700 ! +++ boost/tools/build/v2/tools/msvc.jam 2005-12-06 14:58:39.000000000 -0800 ! @@ -278,10 +278,25 @@ $(.CC) /Zm800 -nologo -TP -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(USER_CFLAGS) @"$(RSP:W)" -c -Fo"$(<[1]:W)" && $(RM) "$(RSP)" } *************** *** 48,52 **** +# so we can include version-dependent manifest files + ! +if ! [ MATCH ^([67].*) : $(version) ] { - $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)" --- 140,144 ---- +# so we can include version-dependent manifest files + ! +if ! [ MATCH ^([67].*) : $(version) ] { - $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)" *************** *** 57,66 **** } +else ! +{ + actions compile.rc + { + $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -DADOBE_VER=7 -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)" + } ! +} # Declare flags and action for linking --- 149,160 ---- } +else ! +{ + actions compile.rc + { + $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -DADOBE_VER=7 -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)" + } ! +} ! + ! +# ADOBE end changes # Declare flags and action for linking Index: patch_boost.sh =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/third_party/boost_tp/adobe/patch_boost.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** patch_boost.sh 6 Oct 2005 20:43:19 -0000 1.4 --- patch_boost.sh 6 Jan 2006 18:35:28 -0000 1.5 *************** *** 7,12 **** echo "looking in '"`pwd`"'..." ! if [ ! -d boost_1_33_0 ]; then ! echo "You must have a source directory (boost_1_33_0) in order to patch!" exit 1; fi --- 7,12 ---- echo "looking in '"`pwd`"'..." ! if [ ! -d boost_1_33_1 ]; then ! echo "You must have a source directory (boost_1_33_1) in order to patch!" exit 1; fi *************** *** 17,21 **** fi ! patch -uN -p0 -g0 < adobe/boost_1_33_0_patch_01.txt echo "Patching of Boost succeeded. Happy coding!" --- 17,21 ---- fi ! patch -uN -p0 -g0 < adobe/boost_1_33_1_patch_01.txt echo "Patching of Boost succeeded. Happy coding!" |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:40
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/zuidgen/bindebug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/zuidgen/bindebug Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:39
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin Added Files: adobe_all.xcconfig adobe_debug.xcconfig adobe_release.xcconfig adobe_widgets.xcconfig asl_dev_all.xcconfig asl_dir.xcconfig boost_all.xcconfig Log Message: asl 1.0.12 --- NEW FILE: adobe_widgets.xcconfig --- #include "asl_dev_all.xcconfig" ADOBE_DEV_ALL_SEARCH_PATHS = $(ADOBE_BOOST_ALL_SEARCH_PATHS) $(ASL_DIR)adobe/future/widgets/headers/ $(ASL_DIR)adobe/future/widgets/headers/mac/ HEADER_SEARCH_PATHS = $(ADOBE_DEV_ALL_SEARCH_PATHS) --- NEW FILE: adobe_release.xcconfig --- ADOBE_RELEASE_PREPROCESSOR_DEFINITIONS = NDEBUG DEAD_CODE_STRIPPING = YES GCC_DEBUGGING_SYMBOLS = default GCC_PREPROCESSOR_DEFINITIONS = $(value) $(ADOBE_RELEASE_PREPROCESSOR_DEFINITIONS) GCC_GENERATE_DEBUGGING_SYMBOLS = NO GCC_OPTIMIZATION_LEVEL = 3 PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES --- NEW FILE: adobe_debug.xcconfig --- GCC_GENERATE_DEBUGGING_SYMBOLS = YES GCC_OPTIMIZATION_LEVEL = 0 ASL_TARGET_VARIANT = debug GCC_DEBUGGING_SYMBOLS = full --- NEW FILE: adobe_all.xcconfig --- ARCHS = i386 ppc GCC_DYNAMIC_NO_PIC = NO GCC_ENABLE_FIX_AND_CONTINUE = NO GCC_ENABLE_PASCAL_STRINGS = NO GCC_PRECOMPILE_PREFIX_HEADER = NO GCC_PREFIX_HEADER = GCC_TREAT_WARNINGS_AS_ERRORS = YES LINK_WITH_STANDARD_LIBRARIES = YES MACOSX_DEPLOYMENT_TARGET = 10.4 PREBINDING = NO // doesn't work for 10.4.x SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk WARNING_CFLAGS = -Wno-long-double ZERO_LINK = NO --- NEW FILE: boost_all.xcconfig --- #include "asl_dir.xcconfig" ADOBE_BOOST_ALL_PREPROCESSOR_DEFINITIONS = BOOST_SIGNALS_STATIC_LINK=1 BOOST_THREAD_USE_LIB=1 BOOST_ALL_NO_LIB=1 GCC_PREPROCESSOR_DEFINITIONS = $(ADOBE_BOOST_ALL_PREPROCESSOR_DEFINITIONS) ADOBE_BOOST_ALL_SEARCH_PATHS = $(ADOBE_DIR_SEARCH_PATHS) $(ASL_DIR)third_party/boost_tp/boost/ HEADER_SEARCH_PATHS = $(ADOBE_BOOST_ALL_SEARCH_PATHS) --- NEW FILE: asl_dir.xcconfig --- #include "adobe_all.xcconfig" ASL_DIR = ../../ ADOBE_DIR_SEARCH_PATHS = $(ASL_DIR) HEADER_SEARCH_PATHS = $(ADOBE_DIR_SEARCH_PATHS) --- NEW FILE: asl_dev_all.xcconfig --- #include "boost_all.xcconfig" ADOBE_DEV_ALL_PREPROCESSOR_DEFINITIONS = $(ADOBE_BOOST_ALL_PREPROCESSOR_DEFINITIONS) ADOBE_SERIALIZATION=1 GCC_PREPROCESSOR_DEFINITIONS = $(ADOBE_DEV_ALL_PREPROCESSOR_DEFINITIONS) LIBRARY_SEARCH_PATHS = $(value) ./build/$(CONFIGURATION)/ |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:39
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin/begin.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin/begin.xcodeproj Added Files: project.pbxproj Log Message: asl 1.0.12 --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 42; objects = { /* Begin PBXBuildFile section */ 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; CE5C21A20947A6FA00EB4BB6 /* express_viewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C21A00947A6FA00EB4BB6 /* express_viewer.cpp */; }; CE5C21A30947A6FA00EB4BB6 /* report_exception.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C21A10947A6FA00EB4BB6 /* report_exception.cpp */; }; CE5C21A50947A70800EB4BB6 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C21A40947A70800EB4BB6 /* main.cpp */; }; CE5C21D40947A75300EB4BB6 /* app_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21CC0947A75300EB4BB6 /* app_icon.icns */; }; CE5C21D50947A75300EB4BB6 /* begin.nib in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21CD0947A75300EB4BB6 /* begin.nib */; }; CE5C21D60947A75300EB4BB6 /* editor.adm in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21CE0947A75300EB4BB6 /* editor.adm */; }; CE5C21D70947A75300EB4BB6 /* editor.eve in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21CF0947A75300EB4BB6 /* editor.eve */; }; CE5C21D80947A75300EB4BB6 /* eve_globals.scp in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21D00947A75300EB4BB6 /* eve_globals.scp */; }; CE5C21D90947A75300EB4BB6 /* glossary.xstr in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21D10947A75300EB4BB6 /* glossary.xstr */; }; CE5C21DA0947A75300EB4BB6 /* link_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21D20947A75300EB4BB6 /* link_icon.png */; }; CE5C21DB0947A75300EB4BB6 /* metrics_glossary.xstr in Resources */ = {isa = PBXBuildFile; fileRef = CE5C21D30947A75300EB4BB6 /* metrics_glossary.xstr */; }; CE5C22A20947AD9C00EB4BB6 /* libasl_widgets.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE5C21BF0947A71F00EB4BB6 /* libasl_widgets.a */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ 4A9504C5FFE6A39111CA0CBA /* Debug */ = { isa = PBXBuildStyle; buildSettings = { }; name = Debug; }; 4A9504C6FFE6A39111CA0CBA /* Release */ = { isa = PBXBuildStyle; buildSettings = { }; name = Release; }; /* End PBXBuildStyle section */ /* Begin PBXContainerItemProxy section */ CE5C21BE0947A71F00EB4BB6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CE5C21AC0947A71F00EB4BB6 /* asl_widgets.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC046055464E500DB518D; remoteInfo = adobe_widgets; }; CE5C21FD0947AAA500EB4BB6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CE5C21AC0947A71F00EB4BB6 /* asl_widgets.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC045055464E500DB518D; remoteInfo = adobe_widgets; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; }; 8D0C4E970486CD37000505A6 /* Adobe Begin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Adobe Begin.app"; sourceTree = BUILT_PRODUCTS_DIR; }; CE5C21A00947A6FA00EB4BB6 /* express_viewer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = express_viewer.cpp; path = ../../adobe/test/begin/sources/express_viewer.cpp; sourceTree = SOURCE_ROOT; }; CE5C21A10947A6FA00EB4BB6 /* report_exception.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = report_exception.cpp; path = ../../adobe/test/begin/sources/report_exception.cpp; sourceTree = SOURCE_ROOT; }; CE5C21A40947A70800EB4BB6 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../adobe/test/begin/sources/mac/main.cpp; sourceTree = SOURCE_ROOT; }; CE5C21A60947A71400EB4BB6 /* adobe_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_debug.xcconfig; sourceTree = "<group>"; }; CE5C21A70947A71400EB4BB6 /* adobe_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_release.xcconfig; sourceTree = "<group>"; }; CE5C21AC0947A71F00EB4BB6 /* asl_widgets.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = asl_widgets.xcodeproj; sourceTree = "<group>"; }; CE5C21CC0947A75300EB4BB6 /* app_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = app_icon.icns; path = ../../adobe/test/begin/resources/app_icon.icns; sourceTree = SOURCE_ROOT; }; CE5C21CD0947A75300EB4BB6 /* begin.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = begin.nib; path = ../../adobe/test/begin/resources/begin.nib; sourceTree = SOURCE_ROOT; }; CE5C21CE0947A75300EB4BB6 /* editor.adm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = editor.adm; path = ../../adobe/test/begin/resources/editor.adm; sourceTree = SOURCE_ROOT; }; CE5C21CF0947A75300EB4BB6 /* editor.eve */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = editor.eve; path = ../../adobe/test/begin/resources/editor.eve; sourceTree = SOURCE_ROOT; }; CE5C21D00947A75300EB4BB6 /* eve_globals.scp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = eve_globals.scp; path = ../../adobe/test/begin/resources/eve_globals.scp; sourceTree = SOURCE_ROOT; }; CE5C21D10947A75300EB4BB6 /* glossary.xstr */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = glossary.xstr; path = ../../adobe/test/begin/resources/glossary.xstr; sourceTree = SOURCE_ROOT; }; CE5C21D20947A75300EB4BB6 /* link_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = link_icon.png; path = ../../adobe/test/begin/resources/link_icon.png; sourceTree = SOURCE_ROOT; }; CE5C21D30947A75300EB4BB6 /* metrics_glossary.xstr */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; name = metrics_glossary.xstr; path = ../../adobe/test/begin/resources/metrics_glossary.xstr; sourceTree = SOURCE_ROOT; }; CEC06A260948A5FA00AFC610 /* adobe_widgets.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_widgets.xcconfig; sourceTree = "<group>"; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ 8D0C4E910486CD37000505A6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( CE5C22A20947AD9C00EB4BB6 /* libasl_widgets.a in Frameworks */, 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 195DF8CFFE9D517E11CA2CBB /* Products */ = { isa = PBXGroup; children = ( 8D0C4E970486CD37000505A6 /* Adobe Begin.app */, ); name = Products; sourceTree = "<group>"; }; 20286C29FDCF999611CA2CEA /* begin */ = { isa = PBXGroup; children = ( CE5C213909479FCD00EB4BB6 /* xcconfigs */, CE5C21570947A0DB00EB4BB6 /* asl_projects */, 20286C2AFDCF999611CA2CEA /* Sources */, 20286C2CFDCF999611CA2CEA /* Resources */, 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */, 195DF8CFFE9D517E11CA2CBB /* Products */, ); name = begin; sourceTree = "<group>"; }; 20286C2AFDCF999611CA2CEA /* Sources */ = { isa = PBXGroup; children = ( CE5C21A40947A70800EB4BB6 /* main.cpp */, CE5C21A00947A6FA00EB4BB6 /* express_viewer.cpp */, CE5C21A10947A6FA00EB4BB6 /* report_exception.cpp */, ); name = Sources; sourceTree = "<group>"; }; 20286C2CFDCF999611CA2CEA /* Resources */ = { isa = PBXGroup; children = ( CE5C21CC0947A75300EB4BB6 /* app_icon.icns */, CE5C21CD0947A75300EB4BB6 /* begin.nib */, CE5C21CE0947A75300EB4BB6 /* editor.adm */, CE5C21CF0947A75300EB4BB6 /* editor.eve */, CE5C21D00947A75300EB4BB6 /* eve_globals.scp */, CE5C21D10947A75300EB4BB6 /* glossary.xstr */, CE5C21D20947A75300EB4BB6 /* link_icon.png */, CE5C21D30947A75300EB4BB6 /* metrics_glossary.xstr */, ); name = Resources; sourceTree = "<group>"; }; 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( 20286C33FDCF999611CA2CEA /* Carbon.framework */, 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */, 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, ); name = "External Frameworks and Libraries"; sourceTree = "<group>"; }; CE5C213909479FCD00EB4BB6 /* xcconfigs */ = { isa = PBXGroup; children = ( CEC06A260948A5FA00AFC610 /* adobe_widgets.xcconfig */, CE5C21A60947A71400EB4BB6 /* adobe_debug.xcconfig */, CE5C21A70947A71400EB4BB6 /* adobe_release.xcconfig */, ); name = xcconfigs; sourceTree = "<group>"; }; CE5C21570947A0DB00EB4BB6 /* asl_projects */ = { isa = PBXGroup; children = ( CE5C21AC0947A71F00EB4BB6 /* asl_widgets.xcodeproj */, ); name = asl_projects; sourceTree = "<group>"; }; CE5C21AD0947A71F00EB4BB6 /* Products */ = { isa = PBXGroup; children = ( CE5C21BF0947A71F00EB4BB6 /* libasl_widgets.a */, ); name = Products; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ 8D0C4E890486CD37000505A6 /* begin */ = { isa = PBXNativeTarget; buildConfigurationList = C0E91AC508A95435008D54AB /* Build configuration list for PBXNativeTarget "begin" */; buildPhases = ( 8D0C4E8C0486CD37000505A6 /* Resources */, 8D0C4E8F0486CD37000505A6 /* Sources */, 8D0C4E910486CD37000505A6 /* Frameworks */, ); buildRules = ( ); buildSettings = { }; dependencies = ( CE5C21FE0947AAA500EB4BB6 /* PBXTargetDependency */, ); name = begin; productInstallPath = "$(HOME)/Applications"; productName = begin; productReference = 8D0C4E970486CD37000505A6 /* Adobe Begin.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 20286C28FDCF999611CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = C0E91AC908A95435008D54AB /* Build configuration list for PBXProject "begin" */; buildSettings = { }; buildStyles = ( 4A9504C5FFE6A39111CA0CBA /* Debug */, 4A9504C6FFE6A39111CA0CBA /* Release */, ); hasScannedForEncodings = 1; mainGroup = 20286C29FDCF999611CA2CEA /* begin */; projectDirPath = ""; projectReferences = ( { ProductGroup = CE5C21AD0947A71F00EB4BB6 /* Products */; ProjectRef = CE5C21AC0947A71F00EB4BB6 /* asl_widgets.xcodeproj */; }, ); targets = ( 8D0C4E890486CD37000505A6 /* begin */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ CE5C21BF0947A71F00EB4BB6 /* libasl_widgets.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libasl_widgets.a; remoteRef = CE5C21BE0947A71F00EB4BB6 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ 8D0C4E8C0486CD37000505A6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C21D40947A75300EB4BB6 /* app_icon.icns in Resources */, CE5C21D50947A75300EB4BB6 /* begin.nib in Resources */, CE5C21D60947A75300EB4BB6 /* editor.adm in Resources */, CE5C21D70947A75300EB4BB6 /* editor.eve in Resources */, CE5C21D80947A75300EB4BB6 /* eve_globals.scp in Resources */, CE5C21D90947A75300EB4BB6 /* glossary.xstr in Resources */, CE5C21DA0947A75300EB4BB6 /* link_icon.png in Resources */, CE5C21DB0947A75300EB4BB6 /* metrics_glossary.xstr in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ 8D0C4E8F0486CD37000505A6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C21A20947A6FA00EB4BB6 /* express_viewer.cpp in Sources */, CE5C21A30947A6FA00EB4BB6 /* report_exception.cpp in Sources */, CE5C21A50947A70800EB4BB6 /* main.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ CE5C21FE0947AAA500EB4BB6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = adobe_widgets; targetProxy = CE5C21FD0947AAA500EB4BB6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ C0E91AC608A95435008D54AB /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C21A60947A71400EB4BB6 /* adobe_debug.xcconfig */; buildSettings = { }; name = Debug; }; C0E91AC708A95435008D54AB /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C21A70947A71400EB4BB6 /* adobe_release.xcconfig */; buildSettings = { }; name = Release; }; C0E91ACA08A95435008D54AB /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CEC06A260948A5FA00AFC610 /* adobe_widgets.xcconfig */; buildSettings = { INFOPLIST_FILE = "$(ASL_DIR)adobe/test/begin/Info.plist"; PRODUCT_NAME = "Adobe Begin"; USER_HEADER_SEARCH_PATHS = "$(ASL_DIR)adobe/test/begin/headers/ $(ASL_DIR)/adobe/future/"; WRAPPER_EXTENSION = app; }; name = Debug; }; C0E91ACB08A95435008D54AB /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CEC06A260948A5FA00AFC610 /* adobe_widgets.xcconfig */; buildSettings = { INFOPLIST_FILE = "$(ASL_DIR)adobe/test/begin/Info.plist"; PRODUCT_NAME = "Adobe Begin"; USER_HEADER_SEARCH_PATHS = "$(ASL_DIR)adobe/test/begin/headers/ $(ASL_DIR)/adobe/future/"; WRAPPER_EXTENSION = app; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ C0E91AC508A95435008D54AB /* Build configuration list for PBXNativeTarget "begin" */ = { isa = XCConfigurationList; buildConfigurations = ( C0E91AC608A95435008D54AB /* Debug */, C0E91AC708A95435008D54AB /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; C0E91AC908A95435008D54AB /* Build configuration list for PBXProject "begin" */ = { isa = XCConfigurationList; buildConfigurations = ( C0E91ACA08A95435008D54AB /* Debug */, C0E91ACB08A95435008D54AB /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; rootObject = 20286C28FDCF999611CA2CEA /* Project object */; } |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:39
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin/asl_widgets.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin/asl_widgets.xcodeproj Added Files: project.pbxproj Log Message: asl 1.0.12 --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 42; objects = { /* Begin PBXBuildFile section */ CE5C209A094799D100EB4BB6 /* client_assembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2097094799D100EB4BB6 /* client_assembler.cpp */; }; CE5C209B094799D100EB4BB6 /* ui_core_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2098094799D100EB4BB6 /* ui_core_common.cpp */; }; CE5C209C094799D100EB4BB6 /* ui_core.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2099094799D100EB4BB6 /* ui_core.cpp */; }; CE5C20A3094799FA00EB4BB6 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C209F094799FA00EB4BB6 /* display.cpp */; }; CE5C20A4094799FA00EB4BB6 /* metrics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20A0094799FA00EB4BB6 /* metrics.cpp */; }; CE5C20A5094799FA00EB4BB6 /* ui_core_implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20A1094799FA00EB4BB6 /* ui_core_implementation.cpp */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; }; CE5C20A6094799FA00EB4BB6 /* ui_overlay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C20A2094799FA00EB4BB6 /* ui_overlay.cpp */; }; CE5C22AF0947ADD700EB4BB6 /* assemblage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C22AB0947ADD700EB4BB6 /* assemblage.cpp */; }; CE5C22B00947ADD700EB4BB6 /* iomanip_asl_cel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C22AC0947ADD700EB4BB6 /* iomanip_asl_cel.cpp */; }; CE5C22B10947ADD700EB4BB6 /* iomanip_pdf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C22AD0947ADD700EB4BB6 /* iomanip_pdf.cpp */; }; CE5C22B20947ADD700EB4BB6 /* iomanip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C22AE0947ADD700EB4BB6 /* iomanip.cpp */; }; CEC06A0B0948A55300AFC610 /* libasl_dev.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CEC06A080948A54600AFC610 /* libasl_dev.a */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ 014CEA520018CE5811CA2923 /* Debug */ = { isa = PBXBuildStyle; buildSettings = { }; name = Debug; }; 014CEA530018CE5811CA2923 /* Release */ = { isa = PBXBuildStyle; buildSettings = { }; name = Release; }; /* End PBXBuildStyle section */ /* Begin PBXContainerItemProxy section */ CEC06A070948A54600AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069FC0948A54600AFC610 /* asl_dev.xcodeproj */; proxyType = 2; remoteGlobalIDString = D2AAC046055464E500DB518D; remoteInfo = adobe_dev; }; CEC06A090948A54B00AFC610 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CEC069FC0948A54600AFC610 /* asl_dev.xcodeproj */; proxyType = 1; remoteGlobalIDString = D2AAC045055464E500DB518D; remoteInfo = adobe_dev; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_debug.xcconfig; sourceTree = "<group>"; }; CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_release.xcconfig; sourceTree = "<group>"; }; CE5C208F0947996A00EB4BB6 /* adobe_widgets.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_widgets.xcconfig; sourceTree = "<group>"; }; CE5C2097094799D100EB4BB6 /* client_assembler.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = client_assembler.cpp; path = ../../adobe/future/widgets/sources/client_assembler.cpp; sourceTree = SOURCE_ROOT; }; CE5C2098094799D100EB4BB6 /* ui_core_common.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ui_core_common.cpp; path = ../../adobe/future/widgets/sources/ui_core_common.cpp; sourceTree = SOURCE_ROOT; }; CE5C2099094799D100EB4BB6 /* ui_core.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ui_core.cpp; path = ../../adobe/future/widgets/sources/ui_core.cpp; sourceTree = SOURCE_ROOT; }; CE5C209F094799FA00EB4BB6 /* display.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = display.cpp; path = ../../adobe/future/widgets/sources/mac/display.cpp; sourceTree = SOURCE_ROOT; }; CE5C20A0094799FA00EB4BB6 /* metrics.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = metrics.cpp; path = ../../adobe/future/widgets/sources/mac/metrics.cpp; sourceTree = SOURCE_ROOT; }; CE5C20A1094799FA00EB4BB6 /* ui_core_implementation.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ui_core_implementation.cpp; path = ../../adobe/future/widgets/sources/mac/ui_core_implementation.cpp; sourceTree = SOURCE_ROOT; }; CE5C20A2094799FA00EB4BB6 /* ui_overlay.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ui_overlay.cpp; path = ../../adobe/future/widgets/sources/mac/ui_overlay.cpp; sourceTree = SOURCE_ROOT; }; CE5C22AB0947ADD700EB4BB6 /* assemblage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = assemblage.cpp; path = ../../adobe/future/source/assemblage.cpp; sourceTree = SOURCE_ROOT; }; CE5C22AC0947ADD700EB4BB6 /* iomanip_asl_cel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = iomanip_asl_cel.cpp; path = ../../adobe/future/source/iomanip_asl_cel.cpp; sourceTree = SOURCE_ROOT; }; CE5C22AD0947ADD700EB4BB6 /* iomanip_pdf.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = iomanip_pdf.cpp; path = ../../adobe/future/source/iomanip_pdf.cpp; sourceTree = SOURCE_ROOT; }; CE5C22AE0947ADD700EB4BB6 /* iomanip.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = iomanip.cpp; path = ../../adobe/future/source/iomanip.cpp; sourceTree = SOURCE_ROOT; }; CEC069FC0948A54600AFC610 /* asl_dev.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = asl_dev.xcodeproj; sourceTree = "<group>"; }; D2AAC046055464E500DB518D /* libasl_widgets.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libasl_widgets.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( CEC06A0B0948A55300AFC610 /* libasl_dev.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 08FB7794FE84155DC02AAC07 /* boost_signals */ = { isa = PBXGroup; children = ( CE5C1FF1094795E800EB4BB6 /* xcconfigs */, CEC069F90948A53300AFC610 /* asl_projects */, 08FB7795FE84155DC02AAC07 /* Source */, C6A0FF2B0290797F04C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = boost_signals; sourceTree = "<group>"; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( CE5C22AB0947ADD700EB4BB6 /* assemblage.cpp */, CE5C22AC0947ADD700EB4BB6 /* iomanip_asl_cel.cpp */, CE5C22AD0947ADD700EB4BB6 /* iomanip_pdf.cpp */, CE5C22AE0947ADD700EB4BB6 /* iomanip.cpp */, CE5C209F094799FA00EB4BB6 /* display.cpp */, CE5C20A0094799FA00EB4BB6 /* metrics.cpp */, CE5C20A1094799FA00EB4BB6 /* ui_core_implementation.cpp */, CE5C20A2094799FA00EB4BB6 /* ui_overlay.cpp */, CE5C2097094799D100EB4BB6 /* client_assembler.cpp */, CE5C2098094799D100EB4BB6 /* ui_core_common.cpp */, CE5C2099094799D100EB4BB6 /* ui_core.cpp */, ); name = Source; sourceTree = "<group>"; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libasl_widgets.a */, ); name = Products; sourceTree = "<group>"; }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( ); name = Documentation; sourceTree = "<group>"; }; CE5C1FF1094795E800EB4BB6 /* xcconfigs */ = { isa = PBXGroup; children = ( CE5C208F0947996A00EB4BB6 /* adobe_widgets.xcconfig */, CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */, CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */, ); name = xcconfigs; sourceTree = "<group>"; }; CEC069F90948A53300AFC610 /* asl_projects */ = { isa = PBXGroup; children = ( CEC069FC0948A54600AFC610 /* asl_dev.xcodeproj */, ); name = asl_projects; sourceTree = "<group>"; }; CEC069FD0948A54600AFC610 /* Products */ = { isa = PBXGroup; children = ( CEC06A080948A54600AFC610 /* libasl_dev.a */, ); name = Products; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ D2AAC045055464E500DB518D /* adobe_widgets */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "adobe_widgets" */; buildPhases = ( D2AAC043055464E500DB518D /* Headers */, D2AAC044055464E500DB518D /* Sources */, D289987405E68DCB004EDB86 /* Frameworks */, ); buildRules = ( ); buildSettings = { }; dependencies = ( CEC06A0A0948A54B00AFC610 /* PBXTargetDependency */, ); name = adobe_widgets; productName = boost_signals; productReference = D2AAC046055464E500DB518D /* libasl_widgets.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "asl_widgets" */; buildSettings = { }; buildStyles = ( 014CEA520018CE5811CA2923 /* Debug */, 014CEA530018CE5811CA2923 /* Release */, ); hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* boost_signals */; projectDirPath = ""; projectReferences = ( { ProductGroup = CEC069FD0948A54600AFC610 /* Products */; ProjectRef = CEC069FC0948A54600AFC610 /* asl_dev.xcodeproj */; }, ); targets = ( D2AAC045055464E500DB518D /* adobe_widgets */, ); }; /* End PBXProject section */ /* Begin PBXReferenceProxy section */ CEC06A080948A54600AFC610 /* libasl_dev.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libasl_dev.a; remoteRef = CEC06A070948A54600AFC610 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ /* Begin PBXSourcesBuildPhase section */ D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C209A094799D100EB4BB6 /* client_assembler.cpp in Sources */, CE5C209B094799D100EB4BB6 /* ui_core_common.cpp in Sources */, CE5C209C094799D100EB4BB6 /* ui_core.cpp in Sources */, CE5C20A3094799FA00EB4BB6 /* display.cpp in Sources */, CE5C20A4094799FA00EB4BB6 /* metrics.cpp in Sources */, CE5C20A5094799FA00EB4BB6 /* ui_core_implementation.cpp in Sources */, CE5C20A6094799FA00EB4BB6 /* ui_overlay.cpp in Sources */, CE5C22AF0947ADD700EB4BB6 /* assemblage.cpp in Sources */, CE5C22B00947ADD700EB4BB6 /* iomanip_asl_cel.cpp in Sources */, CE5C22B10947ADD700EB4BB6 /* iomanip_pdf.cpp in Sources */, CE5C22B20947ADD700EB4BB6 /* iomanip.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ CEC06A0A0948A54B00AFC610 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = adobe_dev; targetProxy = CEC06A090948A54B00AFC610 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */; buildSettings = { }; name = Debug; }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */; buildSettings = { }; name = Release; }; 1DEB91F008733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C208F0947996A00EB4BB6 /* adobe_widgets.xcconfig */; buildSettings = { PRODUCT_NAME = asl_widgets; }; name = Debug; }; 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C208F0947996A00EB4BB6 /* adobe_widgets.xcconfig */; buildSettings = { PRODUCT_NAME = asl_widgets; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "adobe_widgets" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91EC08733DB70010E9CD /* Debug */, 1DEB91ED08733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "asl_widgets" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91F008733DB70010E9CD /* Debug */, 1DEB91F108733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; } |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:39
|
Update of /cvsroot/adobe-source/adobe-source/stationery In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/stationery Removed Files: asl_debug.xcconfig asl_dev_debug.xcconfig asl_dev_release.xcconfig asl_release.xcconfig Log Message: asl 1.0.12 --- asl_release.xcconfig DELETED --- --- asl_dev_debug.xcconfig DELETED --- --- asl_debug.xcconfig DELETED --- --- asl_dev_release.xcconfig DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:39
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/vc8/Debug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/vc8/Debug Modified Files: editor.adm editor.eve Log Message: asl 1.0.12 Index: editor.eve =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/ide_projects/vc8/Debug/editor.eve,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editor.eve 2 Dec 2005 02:52:57 -0000 1.1 --- editor.eve 6 Jan 2006 18:35:28 -0000 1.2 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) Index: editor.adm =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/ide_projects/vc8/Debug/editor.adm,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** editor.adm 2 Dec 2005 02:52:57 -0000 1.1 --- editor.adm 6 Jan 2006 18:35:28 -0000 1.2 *************** *** 1,4 **** /* ! Copyright 2005 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) --- 1,4 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:38
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/eve_smoke/bindebug In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/eve_smoke/bindebug Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:38
|
Update of /cvsroot/adobe-source/adobe-source/ide_projects/darwin/boost_signals.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/ide_projects/darwin/boost_signals.xcodeproj Added Files: project.pbxproj Log Message: asl 1.0.12 --- NEW FILE: project.pbxproj --- // !$*UTF8*$! { archiveVersion = 1; classes = { }; objectVersion = 42; objects = { /* Begin PBXBuildFile section */ CE5C2031094797BA00EB4BB6 /* connection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C202C094797BA00EB4BB6 /* connection.cpp */; }; CE5C2032094797BA00EB4BB6 /* named_slot_map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C202D094797BA00EB4BB6 /* named_slot_map.cpp */; }; CE5C2033094797BA00EB4BB6 /* signal_base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C202E094797BA00EB4BB6 /* signal_base.cpp */; }; CE5C2034094797BA00EB4BB6 /* slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C202F094797BA00EB4BB6 /* slot.cpp */; }; CE5C2035094797BA00EB4BB6 /* trackable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE5C2030094797BA00EB4BB6 /* trackable.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXBuildStyle section */ 014CEA520018CE5811CA2923 /* Debug */ = { isa = PBXBuildStyle; buildSettings = { }; name = Debug; }; 014CEA530018CE5811CA2923 /* Release */ = { isa = PBXBuildStyle; buildSettings = { }; name = Release; }; /* End PBXBuildStyle section */ /* Begin PBXFileReference section */ CE5C202C094797BA00EB4BB6 /* connection.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = connection.cpp; path = ../../third_party/boost_tp/boost/libs/signals/src/connection.cpp; sourceTree = SOURCE_ROOT; }; CE5C202D094797BA00EB4BB6 /* named_slot_map.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = named_slot_map.cpp; path = ../../third_party/boost_tp/boost/libs/signals/src/named_slot_map.cpp; sourceTree = SOURCE_ROOT; }; CE5C202E094797BA00EB4BB6 /* signal_base.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = signal_base.cpp; path = ../../third_party/boost_tp/boost/libs/signals/src/signal_base.cpp; sourceTree = SOURCE_ROOT; }; CE5C202F094797BA00EB4BB6 /* slot.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = slot.cpp; path = ../../third_party/boost_tp/boost/libs/signals/src/slot.cpp; sourceTree = SOURCE_ROOT; }; CE5C2030094797BA00EB4BB6 /* trackable.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = trackable.cpp; path = ../../third_party/boost_tp/boost/libs/signals/src/trackable.cpp; sourceTree = SOURCE_ROOT; }; CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_debug.xcconfig; sourceTree = "<group>"; }; CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = adobe_release.xcconfig; sourceTree = "<group>"; }; CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; path = boost_all.xcconfig; sourceTree = "<group>"; }; D2AAC046055464E500DB518D /* libboost_signals.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboost_signals.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ D289987405E68DCB004EDB86 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 08FB7794FE84155DC02AAC07 /* boost_signals */ = { isa = PBXGroup; children = ( CE5C1FF1094795E800EB4BB6 /* xcconfigs */, 08FB7795FE84155DC02AAC07 /* Source */, C6A0FF2B0290797F04C91782 /* Documentation */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); name = boost_signals; sourceTree = "<group>"; }; 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( CE5C202C094797BA00EB4BB6 /* connection.cpp */, CE5C202D094797BA00EB4BB6 /* named_slot_map.cpp */, CE5C202E094797BA00EB4BB6 /* signal_base.cpp */, CE5C202F094797BA00EB4BB6 /* slot.cpp */, CE5C2030094797BA00EB4BB6 /* trackable.cpp */, ); name = Source; sourceTree = "<group>"; }; 1AB674ADFE9D54B511CA2CBB /* Products */ = { isa = PBXGroup; children = ( D2AAC046055464E500DB518D /* libboost_signals.a */, ); name = Products; sourceTree = "<group>"; }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( ); name = Documentation; sourceTree = "<group>"; }; CE5C1FF1094795E800EB4BB6 /* xcconfigs */ = { isa = PBXGroup; children = ( CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */, CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */, CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */, ); name = xcconfigs; sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ D2AAC043055464E500DB518D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ D2AAC045055464E500DB518D /* boost_signals */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "boost_signals" */; buildPhases = ( D2AAC043055464E500DB518D /* Headers */, D2AAC044055464E500DB518D /* Sources */, D289987405E68DCB004EDB86 /* Frameworks */, ); buildRules = ( ); buildSettings = { }; dependencies = ( ); name = boost_signals; productName = boost_signals; productReference = D2AAC046055464E500DB518D /* libboost_signals.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boost_signals" */; buildSettings = { }; buildStyles = ( 014CEA520018CE5811CA2923 /* Debug */, 014CEA530018CE5811CA2923 /* Release */, ); hasScannedForEncodings = 1; mainGroup = 08FB7794FE84155DC02AAC07 /* boost_signals */; projectDirPath = ""; targets = ( D2AAC045055464E500DB518D /* boost_signals */, ); }; /* End PBXProject section */ /* Begin PBXSourcesBuildPhase section */ D2AAC044055464E500DB518D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( CE5C2031094797BA00EB4BB6 /* connection.cpp in Sources */, CE5C2032094797BA00EB4BB6 /* named_slot_map.cpp in Sources */, CE5C2033094797BA00EB4BB6 /* signal_base.cpp in Sources */, CE5C2034094797BA00EB4BB6 /* slot.cpp in Sources */, CE5C2035094797BA00EB4BB6 /* trackable.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ 1DEB91EC08733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2036094797C700EB4BB6 /* adobe_debug.xcconfig */; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", "BOOST_SIGNALS_NO_LIB=1", ); PRODUCT_NAME = boost_signals; }; name = Debug; }; 1DEB91ED08733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2037094797C700EB4BB6 /* adobe_release.xcconfig */; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = ( "$(value)", "$(ADOBE_RELEASE_PREPROCESSOR_DEFINITIONS)", "BOOST_SIGNALS_NO_LIB=1", ); PRODUCT_NAME = boost_signals; }; name = Release; }; 1DEB91F008733DB70010E9CD /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */; buildSettings = { }; name = Debug; }; 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = CE5C2038094797C700EB4BB6 /* boost_all.xcconfig */; buildSettings = { }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 1DEB91EB08733DB70010E9CD /* Build configuration list for PBXNativeTarget "boost_signals" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91EC08733DB70010E9CD /* Debug */, 1DEB91ED08733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "boost_signals" */ = { isa = XCConfigurationList; buildConfigurations = ( 1DEB91F008733DB70010E9CD /* Debug */, 1DEB91F108733DB70010E9CD /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */; } |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:36
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/zuidgen/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/zuidgen/bin Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:35
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/xstr_test/bin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/xstr_test/bin Removed Files: placeholder Log Message: asl 1.0.12 --- placeholder DELETED --- |
Update of /cvsroot/adobe-source/adobe-source/adobe/test/gil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/gil Added Files: Jamfile.v2 dynamic_image.cpp gil_test_config.hpp image.cpp main.cpp pixel.cpp pixel_iterator.cpp stdafx.h Log Message: asl 1.0.12 --- NEW FILE: dynamic_image.cpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ // image_test.cpp : Defines the entry point for the console application. // #include <iostream> #include <boost/type_traits.hpp> #include <boost/utility/result_of.hpp> #include "stdafx.h" #ifdef NO_ASL #include <gil/extension/conceptspace/any_standard_image.hpp> #include <gil/core/image_view_factory.hpp> #include <gil/core/algorithm.hpp> #include <gil/extension/io/image_io.hpp> #else #include <adobe/gil/extension/conceptspace/any_standard_image.hpp> #include <adobe/gil/core/image_view_factory.hpp> #include <adobe/gil/core/algorithm.hpp> template <typename V> inline void load_image(GIL::image<V>& img, const std::string& fileName) {} template <typename C> inline void load_image(GIL::variant<C>& img, const std::string& fileName) {} template <typename V> inline void load_jpeg_image(GIL::image<V>& img, const std::string& fileName) {} template <typename C> inline void load_jpeg_image(GIL::variant<C>& img, const std::string& fileName) {} template <typename IMG_VIEW> inline void save_view(const IMG_VIEW& img_view, const std::string& fileName, int quality=100) {} #endif using namespace GIL; using namespace std; template <typename V> const point2<int>& get_size(const image<V>& img) { return view(img).dimensions(); } // BEGIN GLUE CODE struct size2_fn { typedef const point2<int>& result_type; template <typename V> result_type operator()(const image<V>& img) const { return get_size(img); } }; template <typename C> const point2<int>& get_size(const variant<C>& img) { return img.apply_visitor(size2_fn()); } // END GLUE CODE // non-const operation struct set_firstp_fn { typedef void result_type; template <typename I> result_type operator()(image<I>& img) const { img(0,0)=img(1,0); } }; void test_dynamic_views(const std::string& fileName) { const std::string in_dir="C:\\test\\imgtest\\"; const std::string out_dir=in_dir+"newimg_output\\generic\\"; /* rgb8_image rgb8; load_image(rgb8, in_dir+fileName); gray8_image gray8(view(rgb8).dimensions()); copy_and_convert_pixels(view(rgb8),view(gray8)); save_view(view(gray8), out_dir+"gray8_converted.jpg"); */ any_image anyImg; load_image(anyImg, in_dir+fileName); std::cerr <<"File: "<<in_dir+fileName<<" height:"<<get_height(view(anyImg))<<" numChannels:"<<get_num_channels(view(anyImg))<<std::endl; /* This overflows the VC compiler any_image anyImg2; anyImg2.move_in(gray8_image(get_dimensions(view(anyImg)))); copy_and_convert_pixels(view(anyImg),view(anyImg2)); save_view(view(anyImg2), out_dir+"gray8_converted.jpg"); */ gray8_image gray8(get_dimensions(view(anyImg))); //copy_and_convert_pixels(view(anyImg),view(gray8)); copy_pixels(view(anyImg),view(gray8)); save_view(view(gray8), out_dir+"gray8_converted.jpg"); save_view(fliplr_view(view(anyImg)), out_dir+"fliplr.jpg"); save_view(flipud_view(view(anyImg)), out_dir+"flipud.jpg"); any_view subimageView=subimage_view(view(anyImg),point2<ptrdiff_t>(0,0),point2<ptrdiff_t>(100,100)); save_view(subimageView, out_dir+"subimage.jpg"); save_view(subsampled_view(rotated180_view(view(anyImg)), point2<ptrdiff_t>(2,1)),out_dir+"subsampled180rot.jpg"); } void save_180rot(const std::string& fileNameIn, const std::string& fileNameOut) { any_image img; load_image(img, fileNameIn); save_view(rotated180_view(view(img)), fileNameOut); } void test_gimage() { test_dynamic_views("RGB.tif"); test_dynamic_views("gray.jpg"); } /* void test_gimage2() { typedef variant<AnyImageConceptSpace> AnyImage; typedef variant<AnyImageViewConceptSpace> AnyImageView; // static bool c1=PIXELS_COMPATIBLE(rgb8_pixel, rgb8_pixel); BOOST_STATIC_ASSERT(PIXELS_COMPATIBLE(rgb8_pixel, rgb8_pixel)); BOOST_STATIC_ASSERT(PIXELS_COMPATIBLE(bgr8_pixel, rgb8c_pixel)); BOOST_STATIC_ASSERT(!PIXELS_COMPATIBLE(bgr8_pixel, rgba8_pixel)); rgb8_image img1(10,10); fill_pixels(view(img1),rgb8_pixel(100,50,25)); AnyImageView imv1=view(img1); bgr8_image img2(10,10); AnyImageView imv2=view(img2); copy_pixels(imv1, imv2); copy_pixels(imv2, view(img1)); copy_pixels(view(img1), imv2); point2<int> sz=get_size(img1); // const cmyk8_image img2(point_type(10,10)); // cmyk16_image img2(point_type(10,10)); rgb8_view v=view(img1); AnyImageView av(view(img1)); AnyImage defaultConstructed; { rgb8_image r8(point2<int>(8,8)); AnyImage anyImg(rgb8_image(point2<int>(8,8)), true); rgb8_image r88(point2<int>(8,8)); anyImg.move_in(r88); int stop=0; // sz=get_size(anyImg); } } */ --- NEW FILE: main.cpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ // image_test.cpp : Defines the entry point for the console application. // #include "stdafx.h" void test_integral_image(); int main(int argc, unsigned char* argv[]) { #ifdef NO_ASL test_integral_image(); performance_test(); #endif test_pixel(); test_pixel_iterator(); // test_image_io(); test_image(); // test_image_tiler(); } --- NEW FILE: Jamfile.v2 --- # Jamfile for building the GIL test app project adobe/gil ; run main.cpp pixel.cpp pixel_iterator.cpp image.cpp dynamic_image.cpp : # args : #files : #requirements ; --- NEW FILE: pixel.cpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ // image_test.cpp : Defines the entry point for the console application. // #include "stdafx.h" #include <cassert> #include <boost/type_traits.hpp> #ifdef NO_ASL #include <gil/core/rgb.hpp> #include <gil/core/gray.hpp> #include <gil/core/rgba.hpp> #include <gil/core/cmyk.hpp> #include <gil/core/pixel.hpp> #include <gil/core/pixel_iterator.hpp> #include <gil/core/color_convert.hpp> #include <gil/core/typedefs.hpp> #include <gil/core/gil_concept.hpp> #else #include <adobe/gil/core/rgb.hpp> #include <adobe/gil/core/gray.hpp> #include <adobe/gil/core/rgba.hpp> #include <adobe/gil/core/cmyk.hpp> #include <adobe/gil/core/pixel.hpp> #include <adobe/gil/core/pixel_iterator.hpp> #include <adobe/gil/core/color_convert.hpp> #include <adobe/gil/core/typedefs.hpp> #include <adobe/gil/core/gil_concept.hpp> #endif using namespace GIL; using namespace std; template <typename T> struct clear_fn { void operator()(T& v) { v=0; } }; template <typename T> inline void ignore_unused_variable_warning(const T&){} void test_pixel() { gil_function_requires<MutableChannelConcept<bits8> >(); gil_function_requires<MutableChannelConcept<bits8&> >(); gil_function_requires<ChannelConcept<const bits8&> >(); gil_function_requires<MutableChannelConcept<bits16> >(); gil_function_requires<MutableChannelConcept<bits32> >(); gil_function_requires<MutablePixelConcept<bgr32_pixel> >(); gil_function_requires<MutablePixelConcept<rgb16_planar_ref> >(); gil_function_requires<PixelConcept<rgb8c_pixel> >(); gil_function_requires<PixelsConvertibleConcept<rgb8_pixel,cmyk16_pixel> >(); gil_function_requires<PixelsConvertibleConcept<rgb8_pixel,cmyk16_planar_ref> >(); gil_function_requires<PixelsConvertibleConcept<gray8c_pixel,cmyk16_planar_ref> >(); BOOST_STATIC_ASSERT(rgb_tag::num_channels==3); BOOST_STATIC_ASSERT(bgr_tag::num_channels==3); // dimensions to explore // // values, references, pointers // color spaces (rgb,cmyk,gray) // channel ordering (bgr vs rgb) // planar vs interleaved // PIXEL VALUES // Default constructors and construct with values rgb8_pixel rgb8(10,100,200); bgr8_pixel bgr8(10,100,200); rgb32_pixel rgb32(0.1f, 0.5f, 0.7f); per_channel_set_op(std::bind2nd(std::plus<bits8>(),3),rgb8,rgb8); cmyk8_pixel cmyk8; rgba8_pixel rgba8; gray8_pixel gray8(11); rgb16_pixel rgb16; cmyk16_pixel cmyk16; rgba16_pixel rgba16; bits8 mv=max_channel(rgb8); mv=min_channel(rgb8); // Copy construct from compatible pixel rgb8_pixel rgb8_1(rgb8); cmyk16_pixel cmyk16_1(cmyk16); bgr8_pixel bgr8_1(rgb8); // with different channel ordering assert(bgr8_1==rgb8); // RGB8 fail1(cmyk8); // error: different color space // RGB8 fail2(rgb16); // error: different channel depth // Assignment to compatible pixel rgb8_1=rgb8; bgr8_1=rgb8_pixel(1,2,3); rgb8_1=bgr8_1; assert(rgb8_1.r==1); // rgb8=rgba8; // error different color space // rgb8=rgb16; // error different channel depth // rgb8_pixel result=bgr8_1+rgb8; // PIXEL REFERENCES // rgb8ref rgb8ref_err; // error: references have no default constructors // Assign/copy-construct reference from value rgb8_ref rgb8ref(rgb8); rgb8_planar_ref rgb8planarref(rgb8); rgb8planarref=rgb8_pixel(11,22,32); unsigned char rr=rgb8planarref[2]; ignore_unused_variable_warning(rr); assert(rgb8planarref[2]==32); assert(rgb8[2]==32); rgb32_pixel r32=rgb32_pixel(1,2,3); rgb32_planar_ref rgb32pr(r32); bits32 xty=rgb32pr[2]; ignore_unused_variable_warning(xty); assert(xty==3); assert(r32[2]==3); const rgb8_pixel& CR(rgb8); rgb8ref=CR; rgb8c_pixel rgb8c(1,2,3); //BOOST_STATIC_ASSERT((boost::is_same<bits8,REMOVE_CONST_AND_REFERENCE(const bits8&)>::value)); rgb8c_planar_ref rgb8c_ref=rgb8c; // rgb8=rgb8c_pixel(1,2,3); assert(rgb8ref.b==rgb8.b); assert(rgb8==rgb8ref); assert(rgb8planarref==rgb8ref); boost::add_const<iterator_traits<rgb8_ptr>::reference>::type rgb8_const_ref(rgb8); // rgb8_const_ref=rgb8_pixel(3,5,7); // error: setting value of const reference rgb8planarref.b=33; assert(rgb8_const_ref.b==33); bgr8_ref bgr8_ref(bgr8); gray8_ref gray8_ref(gray8); // copy-construct reference from reference rgb8_ref rgb8ref_1(rgb8ref); rgb8_planar_ref rgb8planarref_1(rgb8ref); // planar from non-planar reference is ok // rgb8_ref rgb8ref_1_err(rgb8planarref); // error: non-planar from planar reference cmyk8_planar_ref cpr(cmyk8); int a=5, b=6; const int& cr=a; const rgb8_planar_ref cr_(rgb8); int& nr=b; rgb8_planar_ref nr_(rgb8); const int& cr2(cr); ignore_unused_variable_warning(cr2); const rgb8_planar_ref cr2_(cr_); const int& cr3(nr); ignore_unused_variable_warning(cr3); const rgb8_planar_ref cr3_(nr_); // SHOULD NOT COMPILE BUT IT DOES!! Bizzare because reference class' copy constructor takes argument by non-const reference, so it should not match "const rgb8_planar_ref" // int& nr2(cr); rgb8_planar_ref _nr2(cr_); // ERROR: reference from const reference int& nr3(nr); ignore_unused_variable_warning(nr3); rgb8_planar_ref _nr3(nr_); // cr=nr; // cr_=nr_; // ERROR: assigning to const reference nr=cr; nr_=cr_; // cr=cr; // cr_=cr_; nr=nr; nr_=nr_; // Assign value or reference to reference rgb8ref=rgb8_pixel(3,5,7); rgb8ref=rgb8ref_1; // rgb8_const_ref=rgb8ref; // error: const from non-const rgb8ref=rgb8_const_ref; // non-const from const // PIXEL POINTERS // typedef const iterator_traits<rgb8_ptr>::pointer RGB8ConstPtr; typedef const rgb8_ptr RGB8ConstPtr; typedef const rgb8_planar_ptr RGB8ConstPlanarPtr; // typedef const iterator_traits<rgb8_planar_ptr>::pointer RGB8ConstPlanarPtr; // constructing from values, references and other pointers RGB8ConstPtr rgb8_const_ptr=NULL; ignore_unused_variable_warning(rgb8_const_ptr); rgb8_ptr rgb8ptr=&rgb8; rgb8=bgr8_pixel(30,20,10); rgb8_planar_ptr rgb8_pptr=&rgb8; ++rgb8_pptr; rgb8_pptr--; rgb8_pptr[0]=rgb8; RGB8ConstPlanarPtr rgb8_const_planar_ptr=&rgb8; // rgb8_const_planar_ptr=&rgb16p; // error: incompatible bit depth // iterator_traits<CMYK8>::pointer cmyk8_ptr=&rgb8; // error: incompatible pointer type RGB8ConstPtr rgb8_const_ptr_err=rgb8ptr; // const pointer from non-regular pointer ignore_unused_variable_warning(rgb8_const_ptr_err); // dereferencing pointers to obtain references rgb8_ref rgb8ref_2=*rgb8ptr; ignore_unused_variable_warning(rgb8ref_2); assert(rgb8ref_2==rgb8); // RGB8Ref rgb8ref_2_err=*rgb8_const_planar_ptr; // error: non-const reference from const pointer rgb8_planar_ref rgb8planarref_3=*rgb8_pptr; // planar reference from planar pointer assert(rgb8planarref_3==rgb8); // RGB8Ref rgb8ref_3=*rgb8_planar_ptr; // error: non-planar reference from planar pointer const rgb8_pixel crgb8=rgb8; *rgb8_pptr=rgb8; *rgb8_pptr=crgb8; byte_advance(rgb8_pptr,3); byte_advance(rgb8_pptr,-3); // CHANNEL OPERATIONS // on values bgr8.b=3; rgb8.g=bgr8.b; rgb8.v<0>(); bgr8.v<0>(); assert(rgb8.g==3); // on references rgb8ref_1.g=bgr8_ref.r; bgr8_ref.b=3; // rgb8_const_ref.b=3; // error: modifying channel of const reference // OPERATOR== // rgb8==cmyk8; // error: incompatible color spaces rgb8==bgr8; // classes with different channel ordering are OK to compare rgb8_planar_ref rf=*rgb8_pptr; // COLOR CONVERSION color_convert(rgb16, gray8); // typedef iterator_traits<iterator_traits<rgb8_planar_ptr>::reference*>::color_space_type cst; // BOOST_STATIC_ASSERT((boost::is_same<rgb_tag,cst>::value)); color_convert(rgb16, rf); color_convert(rgb16, rf=*rgb8_pptr); color_convert(*rgb8_const_planar_ptr, gray8_ref); color_convert(rgb8ref, gray8_ref); // color_convert(rgb8ref, *rgb8_const_ptr); // error: Destination is const // CHANNEL-LEVEL OPERATIONS bgr8*=2; bgr8=rf*2; rgb8_pixel rgb8_2=bgr8/3; rf=bgr8*2; // MATH OPERATIONS rgba8*=3; rgba8=rgba8+rgba8_pixel(1,2,3,4); rgb8+=bgr8_pixel(1,2,3); rgb8=bgr8+rgb8; unsigned char* xxx=0; xxx+=2; rgb8_pptr.p.v<0>()=xxx; set_channels(rgb8_pptr.p,xxx); } /* // Design rationale: // rgb pixel conceptually is a bundle of red, green and blue channels. rgb planar reference is a bundle of red, green and blue channel references. // rgb planar pointer is a bundle of red, green and blue channel pointers. It seems logical to abstract 'bundle of red, green and blue type' into a // separate class that pixels, planar references and planar pointers can reuse. The classes that do this abstraction are 'rgb_base','bgr_base','cmyk_base', etc. // On the other hand, most operations are dependent only on the number of components but not the color space. For example, equality check for RGBA and CMYK // pixels/planarpointers/planarreferences does the same thing - checks whether the four types are pairwise equal. We need to abstract code that // operates on 'four elements' from code that operates on 'three elements', etc., and define basic per-channel operations (=,+,+=,*,==, etc.) at that level. // The classes that do this abstraction are specializations of 'pixel_base'. // Note however, that for binary operators, per-channel operations need to be matched semantically, not based on raw memory order. For example, // when assigning rgb pixel to a bgr pixel, we need to assign the first component of rgb (red) to the third of bgr (red). In other words, the 'n elements' // operations need to be implemented on top of a memory-to-semantic mapping. This is why in our design the classes implementing the 'n elements' abstraction // (pixel_base) take as a template parameter the class that contains the actual elements layed down in memory and that provides the memory-to-semantic mapping // They inherit from it. Inheritance was chosen over containment because it makes it simpler from outside the class to access the channels and the semantic mapping. */ // UNIMPLEMENTED THOUGHTS: // // rgb pixel and bgr pixel are identical classes, except the order of components in memory. One thought is to abstract just the channels listed in // specific order in a separate class and have both rgb and bgr pixels be the same class that inherits or contains a templated bundle of channels of specific order. --- NEW FILE: pixel_iterator.cpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ // image_test.cpp : Defines the entry point for the console application. // #include "stdafx.h" #include <cassert> #ifdef NO_ASL #include <gil/core/rgb.hpp> #include <gil/core/pixel_iterator.hpp> #include <gil/core/typedefs.hpp> #include <gil/core/color_convert.hpp> #else #include <adobe/gil/core/rgb.hpp> #include <adobe/gil/core/pixel_iterator.hpp> #include <adobe/gil/core/typedefs.hpp> #include <adobe/gil/core/color_convert.hpp> #endif using namespace GIL; using namespace std; //using namespace boost; #define COLOR_CONVERT_ITERATOR(I,DST_P) dereference_iterator_adaptor< I ,color_convert_deref_fn< DST_P > > template <typename T> inline void ignore_unused_variable_warning(const T&){} void test_pixel_iterator() { boost::function_requires<Point2DConcept<point2<int> > >(); boost::function_requires<MutablePixelIteratorConcept<bgr8_ptr> >(); boost::function_requires<MutablePixelIteratorConcept<cmyk8_planar_ptr> >(); boost::function_requires<PixelIteratorConcept<rgb8c_planar_step_ptr> >(); boost::function_requires<MutablePixelStepIteratorConcept<rgb8_step_ptr> >(); boost::function_requires<MutableXYLocatorConcept<rgb8_step_loc> >(); boost::function_requires<XYLocatorConcept<rgb8c_planar_step_loc> >(); boost::function_requires<MutablePixelStepIteratorConcept<cmyk8_planar_step_ptr> >(); boost::function_requires<PixelStepIteratorConcept<gray8c_step_ptr> >(); rgb8_pixel rgb8(1,2,3); rgb8_ptr ptr1=&rgb8; byte_advance(ptr1, 3); const rgb8_ptr ptr2=byte_advanced(ptr1,10); byte_distance(ptr1,ptr2); const rgb8_pixel& ref=byte_advanced_ref(ptr1,10); ignore_unused_variable_warning(ref); rgb8_planar_ptr planarPtr1(&rgb8); rgb8_planar_ptr planarPtr2(&rgb8); byte_advance(planarPtr1,10); byte_distance(planarPtr1,planarPtr2); rgb8_planar_ptr planarPtr3=byte_advanced(planarPtr1,10); pixel<bits8&,rgb_tag> pxl=*(planarPtr1+5); // rgb8_pixel pv=pxl; // rgb8_pixel pv=*(planarPtr1+5); rgb8_pixel pv=planarPtr1[5]; assert(*(planarPtr1+5)==planarPtr1[5]); rgb8_planar_ref planarRef=byte_advanced_ref(planarPtr1,10); rgb8_step_ptr stepIt(&rgb8,5); stepIt++; rgb8_step_ptr stepIt2=stepIt+10; stepIt2=stepIt; rgb8_step_ptr stepIt3(&rgb8,5); rgb8_pixel& ref1=stepIt3[5]; // bool v=boost::is_POD<iterator_traits<pixel_step_iterator<rgb8_ptr> >::value_type>::value; // v=boost::is_POD<rgb8_pixel>::value; // v=boost::is_POD<int>::value; rgb8_step_ptr rgb8StepIt(ptr1, 10); rgb8_step_ptr rgb8StepIt2=rgb8StepIt; rgb8StepIt=rgb8StepIt2; ++rgb8StepIt; rgb8_ref reff=*rgb8StepIt; ignore_unused_variable_warning(reff); rgb8StepIt+=10; ptrdiff_t dst=rgb8StepIt2-rgb8StepIt; ignore_unused_variable_warning(dst); rgb8_pixel val1=ref1; rgb8_ptr ptr=&ref1; rgb8_pixel& val21=stepIt3[5]; rgb8_pixel val22=val21; rgb8_pixel val2=stepIt3[5]; rgb8_ptr ptr11=&(stepIt3[5]); ignore_unused_variable_warning(ptr11); rgb8_ptr ptr3=&*(stepIt3+5); ignore_unused_variable_warning(ptr3); rgb8_step_ptr stepIt4(ptr,5); ++stepIt4; rgb8_step_ptr stepIt5; if (stepIt4==stepIt5) { int st=0;ignore_unused_variable_warning(st); } pixel_image_iterator<rgb8_loc> pix_img_it(rgb8_loc(ptr, 20), 5); ++pix_img_it; pix_img_it+=10; rgb8_pixel& refr=*pix_img_it; refr=rgb8_pixel(1,2,3); *pix_img_it=rgb8_pixel(1,2,3); pix_img_it[3]=rgb8_pixel(1,2,3); *(pix_img_it+3)=rgb8_pixel(1,2,3); pixel_image_iterator<rgb8c_loc> pix_img_it_c(rgb8c_loc(rgb8c_ptr(ptr),20), 5); ++pix_img_it_c; pix_img_it_c+=10; // *pix_img_it_c=rgb8_pixel(1,2,3); // error: assigning though const iterator typedef pixel_image_iterator<rgb8_loc>::difference_type dif_t; dif_t dt=0; ptrdiff_t tdt=dt; ignore_unused_variable_warning(tdt); // pixel_step_iterator<rgb8_pixel> stepIt3Err=stepIt+10; // error: non-const from const iterator pixel_xy_locator<rgb8_step_ptr> xy_locator(ptr,27); xy_locator.x()++; // pixel_step_iterator<rgb8_pixel>& yit=xy_locator.y(); xy_locator.y()++; xy_locator+=point2<int>(3,4); //*xy_locator=(xy_locator(-1,0)+xy_locator(0,1))/2; rgb8_pixel& rf=*xy_locator; ignore_unused_variable_warning(rf); typedef COLOR_CONVERT_ITERATOR(rgb8_ptr, rgb8_pixel) CCV; CCV ccv_it; make_step_iterator(ccv_it, 3); make_step_iterator(rgb8_ptr(),3); make_step_iterator(rgb8_planar_ptr(),3); make_step_iterator(rgb8_planar_step_ptr(),3); // xy_locator.y()++; // TEST dynamic_step_type BOOST_STATIC_ASSERT(( boost::is_same<cmyk16_step_ptr,std::iterator_traits<cmyk16_step_ptr>::dynamic_step_type>::value )); BOOST_STATIC_ASSERT(( boost::is_same<cmyk16_planar_step_ptr,std::iterator_traits<cmyk16_planar_ptr>::dynamic_step_type>::value )); BOOST_STATIC_ASSERT(( boost::is_same<dereference_iterator_adaptor< rgb8_step_ptr ,color_convert_deref_fn< rgb8_pixel > > ,std::iterator_traits< CCV >::dynamic_step_type>::value )); // TEST has_dynamic_step BOOST_STATIC_ASSERT(has_dynamic_step< cmyk16_step_ptr >::value); BOOST_STATIC_ASSERT(has_dynamic_step< cmyk16_planar_step_ptr >::value); BOOST_STATIC_ASSERT(!has_dynamic_step< cmyk16_planar_ptr >::value); BOOST_STATIC_ASSERT(!has_dynamic_step< COLOR_CONVERT_ITERATOR(rgb8_ptr, rgb8_pixel) >::value); BOOST_STATIC_ASSERT( has_dynamic_step< COLOR_CONVERT_ITERATOR(rgb8_step_ptr, rgb8_pixel) >::value); } --- NEW FILE: image.cpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ // image_test.cpp : Defines the entry point for the console application. // #include <string> #include <vector> #include <iostream> #include <boost/lambda/lambda.hpp> #include <boost/lambda/bind.hpp> #include "stdafx.h" #ifdef NO_ASL #include <gil/core/image_view_factory.hpp> #include <gil/core/pixel_iterator.hpp> #include <gil/core/color_convert.hpp> #include <gil/core/typedefs.hpp> #include <gil/core/algorithm.hpp> #include <gil/extension/io/image_io.hpp> #include <gil/extension/detection/resample.hpp> #else #include <adobe/gil/core/image_view_factory.hpp> #include <adobe/gil/core/pixel_iterator.hpp> #include <adobe/gil/core/color_convert.hpp> #include <adobe/gil/core/typedefs.hpp> #include <adobe/gil/core/algorithm.hpp> template <typename V> inline void load_image(GIL::image<V>& img, const std::string& fileName) {} template <typename C> inline void load_image(GIL::variant<C>& img, const std::string& fileName) {} template <typename V> inline void load_jpeg_image(GIL::image<V>& img, const std::string& fileName) {} template <typename C> inline void load_jpeg_image(GIL::variant<C>& img, const std::string& fileName) {} template <typename IMG_VIEW> inline void save_view(const IMG_VIEW& img_view, const std::string& fileName, int quality=100) {} static void io_error_if(bool expr, const char* descr) { } #endif using namespace GIL; using namespace std; using namespace boost; const string in_dir="C:\\test\\imgtest\\"; // directory of source images const string out_dir=in_dir+"scratch\\"; // directory where to write output const string ref_dir=in_dir+"reference\\"; // reference directory to compare written with actual output // Enable checking. #define PERFORM_CHECK template <typename IMG_VIEW> void check_image(const IMG_VIEW& img_view, const string& imgName) { save_view(img_view,out_dir+imgName); rgb8_image img1, img2; load_image(img1, out_dir+imgName); #ifdef PERFORM_CHECK load_image(img2, ref_dir+imgName); io_error_if(img1!=img2,"image mismatch"); #endif } // testing image iterators, clone, fill, locators, color convert template <typename IMG> void test_image_basic(const std::string& prefix) { typedef typename IMG::view_type VIEW; // make a 20x20 image IMG img(typename VIEW::point_type(20,20)); const VIEW& img_view=view(img); // fill it with red rgb8_pixel red8(255,0,0), green8(0,255,0), blue8(0,0,255), white8(255,255,255); typename VIEW::value_type red,green,blue,white; color_convert(red8,red); red=color_converter<typename IMG::view_type::value_type>()(red8); color_convert(green8,green); color_convert(blue8,blue); color_convert(white8,white); fill(img_view.begin(),img_view.end(),red); // pointer to first pixel of second row typename VIEW::reference rt=img_view.at(0,0)[img_view.width()]; typename VIEW::x_iterator ptr=&rt; ignore_unused_variable_warning(ptr); typename VIEW::reference rt2=*(img_view.at(0,0)+img_view.width()); typename VIEW::x_iterator ptr2=&rt2; ignore_unused_variable_warning(ptr2); assert(ptr==ptr2); assert(img_view.x_at(0,0)+10==10+img_view.x_at(0,0)); // draw a blue line along the diagonal typename VIEW::xy_locator loc=img_view.xy_at(0,img_view.height()-1); for (int y=0; y<img_view.height(); ++y) { *loc=blue; ++loc.x(); loc.y()--; } // draw a green dotted line along the main diagonal with step of 3 loc=img_view.xy_at(img_view.width()-1,img_view.height()-1); while (loc.x()>=img_view.x_at(0,0)) { *loc=green; loc-=typename VIEW::point_type(3,3); } // Clone and make every red pixel white IMG imgWhite(img); for (typename VIEW::iterator it=view(imgWhite).end(); (it-1)!=view(imgWhite).begin(); --it) { if (*(it-1)==red) *(it-1)=white; } check_image(img_view,prefix+"red_x.jpg"); check_image(view(imgWhite),prefix+"white_x.jpg"); } // test image views template <bool ON_REAL_DATA> struct test_nth_channel_view { template <typename VIEW> static void apply(const VIEW& img_view, const string& prefix) { check_image(nth_channel_view(img_view,0),prefix+"0th_channel.jpg"); } }; template <> struct test_nth_channel_view<false> { template <typename VIEW> static void apply(const VIEW& img_view, const string& prefix) {} }; template <typename VIEW> void test_image_views(const VIEW& img_view, const string& prefix) { check_image(img_view,prefix+"original.jpg"); check_image(subimage_view(img_view, round(img_view.dimensions()/4), round(img_view.dimensions()/2)),prefix+"cropped.jpg"); check_image(color_convert_view<gray8_pixel>(img_view),prefix+"gray8.jpg"); // check_image(transpose_view(img_view),prefix+"transpose.jpg"); check_image(rotated180_view(img_view),prefix+"rot180.jpg"); check_image(rotated90cw_view(img_view),prefix+"90cw.jpg"); check_image(rotated90ccw_view(img_view),prefix+"90ccw.jpg"); check_image(flipud_view(img_view),prefix+"flipped_ud.jpg"); check_image(fliplr_view(img_view),prefix+"flipped_lr.jpg"); check_image(subsampled_view(img_view,typename VIEW::point_type(2,1)),prefix+"subsampled.jpg"); test_nth_channel_view<std::iterator_traits<typename VIEW::x_iterator>::pixel_data_is_real>::apply(img_view,prefix+"0th_channel.jpg"); // some iterator math ptrdiff_t dst=(img_view.end()-(img_view.begin()+4500))+4500; ignore_unused_variable_warning(dst); ptrdiff_t dst2=img_view.end()-img_view.begin(); ignore_unused_variable_warning(dst2); ptrdiff_t sz=img_view.size(); ignore_unused_variable_warning(sz); //assert(dst==dst2);//does not work for empty images assert(sz==dst2); // histogram test_histogram(img_view); } template <typename GRAY_VIEW, typename R> void gray_image_hist(const GRAY_VIEW& img_view, R& hist) { //for_each_pixel(img_view,++lambda::var(hist)[lambda::_1]); for (typename GRAY_VIEW::iterator it=img_view.begin(); it!=img_view.end(); ++it) ++hist[*it]; } template <typename V, typename R> void get_hist(const V& img_view, R& hist) { gray_image_hist(color_convert_view<gray8_pixel>(img_view), hist); } template <typename VIEW> void test_histogram(const VIEW& img_view) { // std::vector<int> histogram(255,0); // get_hist(cropped,histogram.begin()); int histogram[255]; fill(histogram,histogram+255,0); get_hist(img_view,histogram); std::cout<<endl; std::for_each(histogram, histogram+255, std::cout << lambda::_1 << ' '); } template <typename IMG> void test_image_all(const string& prefix) { test_image_basic<IMG>(prefix+"basic_"); IMG img; load_jpeg_image(img,in_dir+"monkey.jpg"); test_image_views(view(img), prefix+"views_"); } #define COLOR_CONVERT_ITERATOR(I,DST_P) GIL::dereference_iterator_adaptor< I ,color_convert_deref_fn< DST_P > > template <typename IMG> void my_const_test(const IMG& img) { typename IMG::const_view_type v=const_view(img); // v(0,0)=pixel<T,CS>(); } template <typename T, typename CS> void my_test() { typename image_type<T,CS,true>::type imgs(100,100); typename view_type<T,CS,true>::type v=view(imgs); my_const_test(imgs); } typedef point2<ptrdiff_t> point_type; template <typename SRC_VIEW, // Models GIL Image View typename DST_IMG> // Models GIL Image void create_with_margin(const SRC_VIEW& src, int k, DST_IMG& result) { swap(result,DST_IMG(src.width()+2*k, src.height()+2*k)); copy_pixels(src, subimage_view(view(result), point_type(k,k), src.dimensions())); } void test_resample() { gil_function_requires<MutableImageViewConcept<rgb8_view> >(); gil_function_requires<ImageViewConcept<cmyk8c_planar_step_view> >(); gil_function_requires<MutableImageConcept<rgb8_image> >(); rgb8_image img; load_jpeg_image(img,in_dir+"monkey.jpg"); rgb8_image transf(rgb8_image::point_type(round(view(img).dimensions()/2))); #ifdef NO_ASL real_matrix ctm=real_matrix::get_rotate(15*3.14/180.0f); ctm*=real_matrix::get_translate(real_point(100,50)); resample_view(view(transf),const_view(img), ctm); save_view(view(transf), out_dir+"transformedBC.jpg"); resample_view(view(transf),const_view(img), ctm, kBilinear); save_view(view(transf), out_dir+"transformedBL.jpg"); resample_view(view(transf),const_view(img), ctm, kNearestNeighbor); save_view(view(transf), out_dir+"transformedNN.jpg"); #endif } void test_image() { gil_function_requires<ImageConcept<rgb8_image> >(); test_resample(); #ifdef NO_ASL CreateDirectory(in_dir.c_str(), NULL); CreateDirectory(out_dir.c_str(), NULL); CreateDirectory(ref_dir.c_str(), NULL); #endif // my_test<bits8,rgb_tag>(); // rgb8_planar_image im(point_type(10,10)); // for_each_pixel(view(im), planarOp()); test_image_all<bgr8_image>("bgr8_"); test_image_all<rgb8_image>("rgb8_"); test_image_all<rgb8_planar_image>("planarrgb8_"); test_image_all<gray8_image>("gray8_"); rgb8_image img; load_jpeg_image(img,in_dir+"monkey.jpg"); rgb8_image img2(view(img).dimensions()); copy(img.rbegin(),img.rend(), img2.begin()); save_view(view(img2),out_dir+"reversedMonkey.jpg"); // rgb8_image imgWithMargin; // create_with_margin(view(img), 100, imgWithMargin); // save_view(view(imgWithMargin),in_dir+"monkeyWithMargin.jpg"); test_image_views(subsampled_view(view(img),point_type(1,2)),"subsampled_"); BOOST_STATIC_ASSERT((!std::iterator_traits<COLOR_CONVERT_ITERATOR(rgb8_view::x_iterator,gray8_pixel) >::pixel_data_is_real)); test_image_views(color_convert_view<gray8_pixel>(view(img)),"color_converted_"); } /* template <typename T, typename C> struct myIterator : public boost::iterator_facade<myIterator<T,C>,pixel<T,C>,boost::random_access_traversal_tag,pixel<T,C> > { typedef boost::iterator_facade<myIterator<T,C>,pixel<T,C>,boost::random_access_traversal_tag,pixel<T,C> > parent_type; typedef typename parent_type::reference reference; typedef typename parent_type::difference_type difference_type; typedef C color_space_type; myIterator() : _x(0),_y(0){} myIterator(int x, int y) : _x(x), _y(y) {} template <typename T1,typename C1> myIterator(const myIterator<T1,C1>& ptr) : _x(ptr._x), _y(ptr._y) {} /// For some reason operator[] provided by boost::iterator_facade returns a custom class that is convertible to reference /// We require our own reference because it is registered in iterator_traits reference operator[](difference_type d) const { return dereference(d);} myIterator(const myIterator& ptr) : parent_type(ptr) {} myIterator& operator=(const myIterator& ptr) { this->_x=ptr._x; this->_y=ptr._y; return *this; } reference dereference(int dx=0) const { return reference(_x+dx+_y); } private: friend class boost::iterator_core_access; int _x,_y; void increment() { ++_x; } void decrement() { --_x; } void advance(ptrdiff_t d) { _x+=d; } ptrdiff_t distance_to(const myIterator& it) const { return it._x-_x; } // THIS IS WRONG! bool equal(const myIterator& it) const { return _x==p._x && _y==p._y; } }; template <typename X_IT> class myXYLocator { public: typedef X_IT x_iterator; typedef pixel_step_iterator<X_IT> y_iterator; typedef typename std::iterator_traits<X_IT>::value_type value_type; typedef typename std::iterator_traits<X_IT>::reference reference; typedef typename std::iterator_traits<X_IT>::pointer pointer; typedef point2<typename std::iterator_traits<X_IT>::difference_type> difference_type; typedef ptrdiff_t cached_location; typedef myXYLocator<typename std::iterator_traits<X_IT>::dynamic_step_type> dynamic_step_type; typedef myXYLocator<typename std::iterator_traits<X_IT>::const_type> const_type; typedef typename std::iterator_traits<x_iterator>::channel_type channel_type; typedef typename std::iterator_traits<x_iterator>::color_space_type color_space_type; myXYLocator(){} myXYLocator(x_iterator x_it, ptrdiff_t row_bytes) : _p(x_it,row_bytes) {} template <typename X> myXYLocator(const myXYLocator<X>& pl) : _p(pl._p) {} x_iterator& x() { return _p.base(); } x_iterator const& x() const { return _p.base(); } y_iterator& y() { return _p; } y_iterator const& y() const { return _p; } ptrdiff_t row_bytes() const { return byte_step(y()); } // row bytes ptrdiff_t pix_bytestep() const { return byte_step(x()); } // distance in bytes between adjacent pixels on the same row reference operator()(ptrdiff_t dx, ptrdiff_t dy) const { return byte_advanced_ref(x(),byte_offset(dx,dy)); } reference operator[](const difference_type& d) const { return byte_advanced_ref(x(),byte_offset(d.x,d.y)); } reference operator*() const { return *_p; } cached_location cache_location(const difference_type& d) const { return byte_offset(d.x,d.y); } cached_location cache_location(ptrdiff_t dx, ptrdiff_t dy) const { return byte_offset(dx,dy); } reference operator[](const cached_location& loc) const { return byte_advanced_ref(x(),loc); } x_iterator x_at(ptrdiff_t dx, ptrdiff_t dy) const { return byte_advanced(x(), byte_offset(dx,dy)); } x_iterator x_at(const difference_type& d) const { return byte_advanced(x(), byte_offset(d.x,d.y)); } x_iterator row_begin(ptrdiff_t y) const { return byte_advanced(x(), y*row_bytes()); } myXYLocator& operator+=(const difference_type& d) { byte_advance(x(),byte_offset(d.x,d.y)); return *this; } myXYLocator& operator-=(const difference_type& d) { byte_advance(x(),byte_offset(-d.x,-d.y)); return *this; } // add is faster than += because there is no need to construct a point myXYLocator& add(ptrdiff_t dx, ptrdiff_t dy) { byte_advance(x(),byte_offset(dx,dy)); return *this; } myXYLocator operator+(const difference_type& d) const { return myXYLocator(x_at( d.x, d.y), row_bytes()); } myXYLocator operator-(const difference_type& d) const { return myXYLocator(x_at(-d.x,-d.y), row_bytes()); } bool operator==(const myXYLocator& p) const { return _p==p._p; } bool operator!=(const myXYLocator& p) const { return _p!=p._p; } private: template <typename X> friend class myXYLocator; ptrdiff_t byte_offset(ptrdiff_t x, ptrdiff_t y) const { return y*row_bytes() + x*pix_bytestep(); } pixel_step_iterator<X_IT> _p; }; */ --- NEW FILE: stdafx.h --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ // stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, but // are changed infrequently // #pragma once #include <string> #ifdef _MSC_VER #pragma inline_depth(255) #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #ifndef WINVER #define WINVER 0x0501 #endif #endif /* #include <afxwin.h> // MFC core and standard components // multibyte and ascii to wide inline const std::wstring& mbToWide(const std::string& mb) { static std::wstring buffer; buffer.resize(mb.size()); mbstowcs(const_cast<wchar_t*>(buffer.c_str()),mb.c_str(),mb.size()); return buffer; } #ifdef UNICODE typedef std::wstring _string; typedef unsigned short _char; #define _strcmp wcscmp #define _stricmp _wcsicmp #define _fopen _wfopen inline const _string& mbToTEXT(const std::string& mb) { return mbToWide(mb); } inline const char* toASCII(const _string& str) { static char buffer[MAX_PATH]; wcstombs(buffer, str.c_str(), MAX_PATH); return buffer; } inline const std::wstring& TEXTToWide(const _string& mb) { return text; } #else typedef std::string _string; typedef char _char; #define _strcmp std::strcmp #define _stricmp stricmp #define _fopen fopen inline const _string& mbToTEXT(const std::string& mb) {return mb; } inline const char* toASCII(const _string& str) { return str.c_str(); } inline const std::wstring& TEXTToWide(const _string& mb) { return mbToWide(mb); } #endif */ void test_pixel(); void test_image_tiler(); void test_pixel_iterator(); void test_image(); void test_gimage(); void test_image_io(); void performance_test(); --- NEW FILE: gil_test_config.hpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ #include <adobe/config.hpp> /*************************************************************************************************/ #ifndef GIL_TEST_CONFIG #define GIL_TEST_CONFIG //#define GIL_IO // use this if GIL's i/o extension is available //#define GIL_RESAMPLE // use this if GIL's resample extension is available #ifdef GIL_IO #include <adobe/gil/extension/io/image_io.hpp> #else // stub to use when i/o extension is unavailable #include <adobe/gil/core/image.hpp> #include <adobe/gil/core/variant.hpp> #include <adobe/gil/core/typedefs.hpp> #include <string> inline void io_error_if(bool, const char*){} template <typename VIEW> void save_view(const VIEW& v,const std::string& fileName) {} template <typename IMG> void load_image(IMG& img, const std::string& fileName) { IMG tmp(100,100); GIL::swap(tmp,img); } template <typename ICS> void load_image(GIL::variant<ICS>& img, const std::string& fileName) { GIL::gray8_image rgb8img(100,100); img.move_in(rgb8img); } #endif #endif |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:34
|
Update of /cvsroot/adobe-source/adobe-source/adobe/gil/extension/conceptspace In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/gil/extension/conceptspace Added Files: any_standard_image.hpp Log Message: asl 1.0.12 --- NEW FILE: any_standard_image.hpp --- /* Copyright 2005-2006 Adobe Systems Incorporated Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt or a copy at http://opensource.adobe.com/licenses.html) */ /*************************************************************************************************/ #ifndef GIL_ANY_STANDARD_IMAGE_H #define GIL_ANY_STANDARD_IMAGE_H //////////////////////////////////////////////////////////////////////////////////////// /// \file /// \brief Non-templated image /// \author Lubomir Bourdev and Hailin Jin \n /// Adobe Systems Incorporated /// /// //////////////////////////////////////////////////////////////////////////////////////// #include "../../core/image.hpp" #include "../../core/typedefs.hpp" #include "../../core/variant.hpp" ADOBE_GIL_NAMESPACE_BEGIN // \{ /// \name channel_typeid /// \ingroup DynamicImage template <typename T> inline unsigned channel_typeid(); // unknown channel type template<> inline unsigned channel_typeid<bits8> () { return 0; } template<> inline unsigned channel_typeid<bits16>() { return 1; } template<> inline unsigned channel_typeid<bits32>() { return 2; } static const int num_channel_types=3; // \} // \{ /// \name channel_typeid /// \ingroup DynamicImage template <typename T> struct x_iterator_typeid { static const unsigned value=0; }; template <typename T> struct x_iterator_typeid<pixel<T,rgb_tag>*> { static const unsigned value=1; }; template <typename T> struct x_iterator_typeid<pixel<T,bgr_tag>*> { static const unsigned value=2; }; template <typename T> struct x_iterator_typeid<planar_ptr<T,rgb_tag> > { static const unsigned value=3; }; template <typename T> struct x_iterator_typeid<pixel<T,rgba_tag>*> { static const unsigned value=4; }; template <typename T> struct x_iterator_typeid<planar_ptr<T,rgba_tag> > { static const unsigned value=5; }; template <typename T> struct x_iterator_typeid<pixel<T,cmyk_tag>*> { static const unsigned value=6; }; template <typename T> struct x_iterator_typeid<planar_ptr<T,cmyk_tag> > { static const unsigned value=7; }; static const int num_pixel_types=8; template <typename I> struct x_iterator_typeid<pixel_step_iterator<I> > { static const unsigned value=num_pixel_types+x_iterator_typeid<I>::value; }; // \} // type_id: // - must have a copy constructor, assignment and equality template <typename DERIVED, size_t MAX_BASE_SIZE> struct AnyImageConceptSpaceBase : public StackBasedConceptSpacePolicy<DERIVED, unsigned, MAX_BASE_SIZE> { typedef StackBasedConceptSpacePolicy<DERIVED, unsigned, MAX_BASE_SIZE> parent_type; typedef typename parent_type::type_id type_id; static type_id get_invalid_id() { return (unsigned)-1; } protected: /// \brief maps the template parameters of an image view to the non-negative integers template <typename V> static type_id get_view_type_id() { return x_iterator_typeid<typename V::x_iterator>::value * num_channel_types + channel_typeid<typename boost::remove_const<typename V::channel_type>::type>(); } }; // we need the size of the largest image and view so we know how much space to allocate for their bases #define LARGEST_IMAGE GIL::cmyk32_planar_image #define LARGEST_VIEW GIL::cmyk32_planar_step_view // Concept space of standard view that disallow modifying their pixels // Since currently there are no operations that change the view parameters, we need only override the const apply operation struct AnyConstImageViewConceptSpace : public AnyImageConceptSpaceBase<AnyConstImageViewConceptSpace, sizeof(LARGEST_VIEW)> { typedef AnyImageConceptSpaceBase<AnyConstImageViewConceptSpace, sizeof(LARGEST_VIEW)> parent_type; typedef parent_type::type_id type_id; typedef parent_type::base_type base_type; typedef AnyConstImageViewConceptSpace const_type; template <typename IMG> static type_id get_type_id() { return get_view_type_id<IMG>(); } template <typename OP> static typename OP::result_type apply(const base_type& img, type_id id, OP& op) { switch (id) { case 0: return op(reinterpret_cast<const gray8c_view& >(img)); break; case 1: return op(reinterpret_cast<const gray16c_view& >(img)); break; case 2: return op(reinterpret_cast<const gray32c_view& >(img)); break; case 3: return op(reinterpret_cast<const rgb8c_view& >(img)); break; case 4: return op(reinterpret_cast<const rgb16c_view& >(img)); break; case 5: return op(reinterpret_cast<const rgb32c_view& >(img)); break; case 6: return op(reinterpret_cast<const bgr8c_view& >(img)); break; case 7: return op(reinterpret_cast<const bgr16c_view& >(img)); break; case 8: return op(reinterpret_cast<const bgr32c_view& >(img)); break; case 9: return op(reinterpret_cast<const rgb8c_planar_view& >(img)); break; case 10: return op(reinterpret_cast<const rgb16c_planar_view& >(img)); break; case 11: return op(reinterpret_cast<const rgb32c_planar_view& >(img)); break; case 12: return op(reinterpret_cast<const rgba8c_view& >(img)); break; case 13: return op(reinterpret_cast<const rgba16c_view& >(img)); break; case 14: return op(reinterpret_cast<const rgba32c_view& >(img)); break; case 15: return op(reinterpret_cast<const rgba8c_planar_view& >(img)); break; case 16: return op(reinterpret_cast<const rgba16c_planar_view& >(img)); break; case 17: return op(reinterpret_cast<const rgba32c_planar_view& >(img)); break; case 18: return op(reinterpret_cast<const cmyk8c_view& >(img)); break; case 19: return op(reinterpret_cast<const cmyk16c_view& >(img)); break; case 20: return op(reinterpret_cast<const cmyk32c_view& >(img)); break; case 21: return op(reinterpret_cast<const cmyk8c_planar_view& >(img)); break; case 22: return op(reinterpret_cast<const cmyk16c_planar_view& >(img)); break; case 23: return op(reinterpret_cast<const cmyk32c_planar_view& >(img)); break; case 24: return op(reinterpret_cast<const gray8c_step_view& >(img)); break; case 25: return op(reinterpret_cast<const gray16c_step_view& >(img)); break; case 26: return op(reinterpret_cast<const gray32c_step_view& >(img)); break; case 27: return op(reinterpret_cast<const rgb8c_step_view& >(img)); break; case 28: return op(reinterpret_cast<const rgb16c_step_view& >(img)); break; case 29: return op(reinterpret_cast<const rgb32c_step_view& >(img)); break; case 30: return op(reinterpret_cast<const bgr8c_step_view& >(img)); break; case 31: return op(reinterpret_cast<const bgr16c_step_view& >(img)); break; case 32: return op(reinterpret_cast<const bgr32c_step_view& >(img)); break; case 33: return op(reinterpret_cast<const rgb8c_planar_step_view& >(img)); break; case 34: return op(reinterpret_cast<const rgb16c_planar_step_view& >(img)); break; case 35: return op(reinterpret_cast<const rgb32c_planar_step_view& >(img)); break; case 36: return op(reinterpret_cast<const rgba8c_step_view& >(img)); break; case 37: return op(reinterpret_cast<const rgba16c_step_view& >(img)); break; case 38: return op(reinterpret_cast<const rgba32c_step_view& >(img)); break; case 39: return op(reinterpret_cast<const rgba8c_planar_step_view& >(img)); break; case 40: return op(reinterpret_cast<const rgba16c_planar_step_view& >(img)); break; case 41: return op(reinterpret_cast<const rgba32c_planar_step_view& >(img)); break; case 42: return op(reinterpret_cast<const cmyk8c_step_view& >(img)); break; case 43: return op(reinterpret_cast<const cmyk16c_step_view& >(img)); break; case 44: return op(reinterpret_cast<const cmyk32c_step_view& >(img)); break; case 45: return op(reinterpret_cast<const cmyk8c_planar_step_view& >(img)); break; case 46: return op(reinterpret_cast<const cmyk16c_planar_step_view& >(img)); break; case 47: return op(reinterpret_cast<const cmyk32c_planar_step_view& >(img)); break; default: throw std::bad_cast(); } } //#ifdef PROVIDE_CONST_VERSIONS template <typename OP> static typename OP::result_type apply(const base_type& img, type_id id, const OP& op) { switch (id) { case 0: return op(reinterpret_cast<const gray8c_view& >(img)); break; case 1: return op(reinterpret_cast<const gray16c_view& >(img)); break; case 2: return op(reinterpret_cast<const gray32c_view& >(img)); break; case 3: return op(reinterpret_cast<const rgb8c_view& >(img)); break; case 4: return op(reinterpret_cast<const rgb16c_view& >(img)); break; case 5: return op(reinterpret_cast<const rgb32c_view& >(img)); break; case 6: return op(reinterpret_cast<const bgr8c_view& >(img)); break; case 7: return op(reinterpret_cast<const bgr16c_view& >(img)); break; case 8: return op(reinterpret_cast<const bgr32c_view& >(img)); break; case 9: return op(reinterpret_cast<const rgb8c_planar_view& >(img)); break; case 10: return op(reinterpret_cast<const rgb16c_planar_view& >(img)); break; case 11: return op(reinterpret_cast<const rgb32c_planar_view& >(img)); break; case 12: return op(reinterpret_cast<const rgba8c_view& >(img)); break; case 13: return op(reinterpret_cast<const rgba16c_view& >(img)); break; case 14: return op(reinterpret_cast<const rgba32c_view& >(img)); break; case 15: return op(reinterpret_cast<const rgba8c_planar_view& >(img)); break; case 16: return op(reinterpret_cast<const rgba16c_planar_view& >(img)); break; case 17: return op(reinterpret_cast<const rgba32c_planar_view& >(img)); break; case 18: return op(reinterpret_cast<const cmyk8c_view& >(img)); break; case 19: return op(reinterpret_cast<const cmyk16c_view& >(img)); break; case 20: return op(reinterpret_cast<const cmyk32c_view& >(img)); break; case 21: return op(reinterpret_cast<const cmyk8c_planar_view& >(img)); break; case 22: return op(reinterpret_cast<const cmyk16c_planar_view& >(img)); break; case 23: return op(reinterpret_cast<const cmyk32c_planar_view& >(img)); break; case 24: return op(reinterpret_cast<const gray8c_step_view& >(img)); break; case 25: return op(reinterpret_cast<const gray16c_step_view& >(img)); break; case 26: return op(reinterpret_cast<const gray32c_step_view& >(img)); break; case 27: return op(reinterpret_cast<const rgb8c_step_view& >(img)); break; case 28: return op(reinterpret_cast<const rgb16c_step_view& >(img)); break; case 29: return op(reinterpret_cast<const rgb32c_step_view& >(img)); break; case 30: return op(reinterpret_cast<const bgr8c_step_view& >(img)); break; case 31: return op(reinterpret_cast<const bgr16c_step_view& >(img)); break; case 32: return op(reinterpret_cast<const bgr32c_step_view& >(img)); break; case 33: return op(reinterpret_cast<const rgb8c_planar_step_view& >(img)); break; case 34: return op(reinterpret_cast<const rgb16c_planar_step_view& >(img)); break; case 35: return op(reinterpret_cast<const rgb32c_planar_step_view& >(img)); break; case 36: return op(reinterpret_cast<const rgba8c_step_view& >(img)); break; case 37: return op(reinterpret_cast<const rgba16c_step_view& >(img)); break; case 38: return op(reinterpret_cast<const rgba32c_step_view& >(img)); break; case 39: return op(reinterpret_cast<const rgba8c_planar_step_view& >(img)); break; case 40: return op(reinterpret_cast<const rgba16c_planar_step_view& >(img)); break; case 41: return op(reinterpret_cast<const rgba32c_planar_step_view& >(img)); break; case 42: return op(reinterpret_cast<const cmyk8c_step_view& >(img)); break; case 43: return op(reinterpret_cast<const cmyk16c_step_view& >(img)); break; case 44: return op(reinterpret_cast<const cmyk32c_step_view& >(img)); break; case 45: return op(reinterpret_cast<const cmyk8c_planar_step_view& >(img)); break; case 46: return op(reinterpret_cast<const cmyk16c_planar_step_view& >(img)); break; case 47: return op(reinterpret_cast<const cmyk32c_planar_step_view& >(img)); break; default: throw std::bad_cast(); } } //#endif }; // Concept space of standard views that allow modifying their pixels // Since currently there are no operations that change the view parameters, we need only override the const apply operation struct AnyImageViewConceptSpace : public AnyImageConceptSpaceBase<AnyImageViewConceptSpace, sizeof(LARGEST_VIEW)> { typedef AnyImageConceptSpaceBase<AnyImageViewConceptSpace, sizeof(LARGEST_VIEW)> parent_type; typedef parent_type::type_id type_id; typedef parent_type::base_type base_type; typedef AnyConstImageViewConceptSpace const_type; template <typename IMG> static type_id get_type_id() { return get_view_type_id<IMG>(); } template <typename OP> static typename OP::result_type apply(const base_type& img, type_id id, OP& op) { switch (id) { case 0: return op(reinterpret_cast<const gray8_view& >(img)); break; case 1: return op(reinterpret_cast<const gray16_view& >(img)); break; case 2: return op(reinterpret_cast<const gray32_view& >(img)); break; case 3: return op(reinterpret_cast<const rgb8_view& >(img)); break; case 4: return op(reinterpret_cast<const rgb16_view& >(img)); break; case 5: return op(reinterpret_cast<const rgb32_view& >(img)); break; case 6: return op(reinterpret_cast<const bgr8_view& >(img)); break; case 7: return op(reinterpret_cast<const bgr16_view& >(img)); break; case 8: return op(reinterpret_cast<const bgr32_view& >(img)); break; case 9: return op(reinterpret_cast<const rgb8_planar_view& >(img)); break; case 10: return op(reinterpret_cast<const rgb16_planar_view& >(img)); break; case 11: return op(reinterpret_cast<const rgb32_planar_view& >(img)); break; case 12: return op(reinterpret_cast<const rgba8_view& >(img)); break; case 13: return op(reinterpret_cast<const rgba16_view& >(img)); break; case 14: return op(reinterpret_cast<const rgba32_view& >(img)); break; case 15: return op(reinterpret_cast<const rgba8_planar_view& >(img)); break; case 16: return op(reinterpret_cast<const rgba16_planar_view& >(img)); break; case 17: return op(reinterpret_cast<const rgba32_planar_view& >(img)); break; case 18: return op(reinterpret_cast<const cmyk8_view& >(img)); break; case 19: return op(reinterpret_cast<const cmyk16_view& >(img)); break; case 20: return op(reinterpret_cast<const cmyk32_view& >(img)); break; case 21: return op(reinterpret_cast<const cmyk8_planar_view& >(img)); break; case 22: return op(reinterpret_cast<const cmyk16_planar_view& >(img)); break; case 23: return op(reinterpret_cast<const cmyk32_planar_view& >(img)); break; case 24: return op(reinterpret_cast<const gray8_step_view& >(img)); break; case 25: return op(reinterpret_cast<const gray16_step_view& >(img)); break; case 26: return op(reinterpret_cast<const gray32_step_view& >(img)); break; case 27: return op(reinterpret_cast<const rgb8_step_view& >(img)); break; case 28: return op(reinterpret_cast<const rgb16_step_view& >(img)); break; case 29: return op(reinterpret_cast<const rgb32_step_view& >(img)); break; case 30: return op(reinterpret_cast<const bgr8_step_view& >(img)); break; case 31: return op(reinterpret_cast<const bgr16_step_view& >(img)); break; case 32: return op(reinterpret_cast<const bgr32_step_view& >(img)); break; case 33: return op(reinterpret_cast<const rgb8_planar_step_view& >(img)); break; case 34: return op(reinterpret_cast<const rgb16_planar_step_view& >(img)); break; case 35: return op(reinterpret_cast<const rgb32_planar_step_view& >(img)); break; case 36: return op(reinterpret_cast<const rgba8_step_view& >(img)); break; case 37: return op(reinterpret_cast<const rgba16_step_view& >(img)); break; case 38: return op(reinterpret_cast<const rgba32_step_view& >(img)); break; case 39: return op(reinterpret_cast<const rgba8_planar_step_view& >(img)); break; case 40: return op(reinterpret_cast<const rgba16_planar_step_view& >(img)); break; case 41: return op(reinterpret_cast<const rgba32_planar_step_view& >(img)); break; case 42: return op(reinterpret_cast<const cmyk8_step_view& >(img)); break; case 43: return op(reinterpret_cast<const cmyk16_step_view& >(img)); break; case 44: return op(reinterpret_cast<const cmyk32_step_view& >(img)); break; case 45: return op(reinterpret_cast<const cmyk8_planar_step_view& >(img)); break; case 46: return op(reinterpret_cast<const cmyk16_planar_step_view& >(img)); break; case 47: return op(reinterpret_cast<const cmyk32_planar_step_view& >(img)); break; default: throw std::bad_cast(); } } //#ifdef PROVIDE_CONST_VERSIONS template <typename OP> static typename OP::result_type apply(const base_type& img, type_id id, const OP& op) { switch (id) { case 0: return op(reinterpret_cast<const gray8_view& >(img)); break; case 1: return op(reinterpret_cast<const gray16_view& >(img)); break; case 2: return op(reinterpret_cast<const gray32_view& >(img)); break; case 3: return op(reinterpret_cast<const rgb8_view& >(img)); break; case 4: return op(reinterpret_cast<const rgb16_view& >(img)); break; case 5: return op(reinterpret_cast<const rgb32_view& >(img)); break; case 6: return op(reinterpret_cast<const bgr8_view& >(img)); break; case 7: return op(reinterpret_cast<const bgr16_view& >(img)); break; case 8: return op(reinterpret_cast<const bgr32_view& >(img)); break; case 9: return op(reinterpret_cast<const rgb8_planar_view& >(img)); break; case 10: return op(reinterpret_cast<const rgb16_planar_view& >(img)); break; case 11: return op(reinterpret_cast<const rgb32_planar_view& >(img)); break; case 12: return op(reinterpret_cast<const rgba8_view& >(img)); break; case 13: return op(reinterpret_cast<const rgba16_view& >(img)); break; case 14: return op(reinterpret_cast<const rgba32_view& >(img)); break; case 15: return op(reinterpret_cast<const rgba8_planar_view& >(img)); break; case 16: return op(reinterpret_cast<const rgba16_planar_view& >(img)); break; case 17: return op(reinterpret_cast<const rgba32_planar_view& >(img)); break; case 18: return op(reinterpret_cast<const cmyk8_view& >(img)); break; case 19: return op(reinterpret_cast<const cmyk16_view& >(img)); break; case 20: return op(reinterpret_cast<const cmyk32_view& >(img)); break; case 21: return op(reinterpret_cast<const cmyk8_planar_view& >(img)); break; case 22: return op(reinterpret_cast<const cmyk16_planar_view& >(img)); break; case 23: return op(reinterpret_cast<const cmyk32_planar_view& >(img)); break; case 24: return op(reinterpret_cast<const gray8_step_view& >(img)); break; case 25: return op(reinterpret_cast<const gray16_step_view& >(img)); break; case 26: return op(reinterpret_cast<const gray32_step_view& >(img)); break; case 27: return op(reinterpret_cast<const rgb8_step_view& >(img)); break; case 28: return op(reinterpret_cast<const rgb16_step_view& >(img)); break; case 29: return op(reinterpret_cast<const rgb32_step_view& >(img)); break; case 30: return op(reinterpret_cast<const bgr8_step_view& >(img)); break; case 31: return op(reinterpret_cast<const bgr16_step_view& >(img)); break; case 32: return op(reinterpret_cast<const bgr32_step_view& >(img)); break; case 33: return op(reinterpret_cast<const rgb8_planar_step_view& >(img)); break; case 34: return op(reinterpret_cast<const rgb16_planar_step_view& >(img)); break; case 35: return op(reinterpret_cast<const rgb32_planar_step_view& >(img)); break; case 36: return op(reinterpret_cast<const rgba8_step_view& >(img)); break; case 37: return op(reinterpret_cast<const rgba16_step_view& >(img)); break; case 38: return op(reinterpret_cast<const rgba32_step_view& >(img)); break; case 39: return op(reinterpret_cast<const rgba8_planar_step_view& >(img)); break; case 40: return op(reinterpret_cast<const rgba16_planar_step_view& >(img)); break; case 41: return op(reinterpret_cast<const rgba32_planar_step_view& >(img)); break; case 42: return op(reinterpret_cast<const cmyk8_step_view& >(img)); break; case 43: return op(reinterpret_cast<const cmyk16_step_view& >(img)); break; case 44: return op(reinterpret_cast<const cmyk32_step_view& >(img)); break; case 45: return op(reinterpret_cast<const cmyk8_planar_step_view& >(img)); break; case 46: return op(reinterpret_cast<const cmyk16_planar_step_view& >(img)); break; case 47: return op(reinterpret_cast<const cmyk32_planar_step_view& >(img)); break; default: throw std::bad_cast(); } } //#endif }; // Concept space of standard images struct AnyImageConceptSpace : public AnyImageConceptSpaceBase<AnyImageConceptSpace, sizeof(LARGEST_IMAGE)> { typedef AnyImageConceptSpaceBase<AnyImageConceptSpace, sizeof(LARGEST_IMAGE)> parent_type; typedef parent_type::type_id type_id; typedef parent_type::base_type base_type; typedef AnyConstImageViewConceptSpace const_view_concept_space; typedef AnyImageViewConceptSpace view_concept_space; /// \brief maps the template parameters of an image to the non-negative integers template <typename IMG> static type_id get_type_id() { return get_view_type_id<typename IMG::view_type>(); } template <typename OP> static typename OP::result_type apply(base_type& img, type_id id, OP& op) { switch (id) { case 0: return op(reinterpret_cast<gray8_image& >(img)); break; case 1: return op(reinterpret_cast<gray16_image& >(img)); break; case 2: return op(reinterpret_cast<gray32_image& >(img)); break; case 3: return op(reinterpret_cast<rgb8_image& >(img)); break; case 4: return op(reinterpret_cast<rgb16_image& >(img)); break; case 5: return op(reinterpret_cast<rgb32_image& >(img)); break; case 6: return op(reinterpret_cast<bgr8_image& >(img)); break; case 7: return op(reinterpret_cast<bgr16_image& >(img)); break; case 8: return op(reinterpret_cast<bgr32_image& >(img)); break; case 9: return op(reinterpret_cast<rgb8_planar_image& >(img)); break; case 10: return op(reinterpret_cast<rgb16_planar_image& >(img)); break; case 11: return op(reinterpret_cast<rgb32_planar_image& >(img)); break; case 12: return op(reinterpret_cast<rgba8_image& >(img)); break; case 13: return op(reinterpret_cast<rgba16_image& >(img)); break; case 14: return op(reinterpret_cast<rgba32_image& >(img)); break; case 15: return op(reinterpret_cast<rgba8_planar_image& >(img)); break; case 16: return op(reinterpret_cast<rgba16_planar_image& >(img)); break; case 17: return op(reinterpret_cast<rgba32_planar_image& >(img)); break; case 18: return op(reinterpret_cast<cmyk8_image& >(img)); break; case 19: return op(reinterpret_cast<cmyk16_image& >(img)); break; case 20: return op(reinterpret_cast<cmyk32_image& >(img)); break; case 21: return op(reinterpret_cast<cmyk8_planar_image& >(img)); break; case 22: return op(reinterpret_cast<cmyk16_planar_image& >(img)); break; case 23: return op(reinterpret_cast<cmyk32_planar_image& >(img)); break; default: throw std::bad_cast(); } } template <typename OP> static typename OP::result_type apply(const base_type& img, type_id id, OP& op) { switch (id) { case 0: return op(reinterpret_cast<const gray8_image& >(img)); break; case 1: return op(reinterpret_cast<const gray16_image& >(img)); break; case 2: return op(reinterpret_cast<const gray32_image& >(img)); break; case 3: return op(reinterpret_cast<const rgb8_image& >(img)); break; case 4: return op(reinterpret_cast<const rgb16_image& >(img)); break; case 5: return op(reinterpret_cast<const rgb32_image& >(img)); break; case 6: return op(reinterpret_cast<const bgr8_image& >(img)); break; case 7: return op(reinterpret_cast<const bgr16_image& >(img)); break; case 8: return op(reinterpret_cast<const bgr32_image& >(img)); break; case 9: return op(reinterpret_cast<const rgb8_planar_image& >(img)); break; case 10: return op(reinterpret_cast<const rgb16_planar_image& >(img)); break; case 11: return op(reinterpret_cast<const rgb32_planar_image& >(img)); break; case 12: return op(reinterpret_cast<const rgba8_image& >(img)); break; case 13: return op(reinterpret_cast<const rgba16_image& >(img)); break; case 14: return op(reinterpret_cast<const rgba32_image& >(img)); break; case 15: return op(reinterpret_cast<const rgba8_planar_image& >(img)); break; case 16: return op(reinterpret_cast<const rgba16_planar_image& >(img)); break; case 17: return op(reinterpret_cast<const rgba32_planar_image& >(img)); break; case 18: return op(reinterpret_cast<const cmyk8_image& >(img)); break; case 19: return op(reinterpret_cast<const cmyk16_image& >(img)); break; case 20: return op(reinterpret_cast<const cmyk32_image& >(img)); break; case 21: return op(reinterpret_cast<const cmyk8_planar_image& >(img)); break; case 22: return op(reinterpret_cast<const cmyk16_planar_image& >(img)); break; case 23: return op(reinterpret_cast<const cmyk32_planar_image& >(img)); break; default: throw std::bad_cast(); } } //#ifdef PROVIDE_CONST_VERSIONS template <typename OP> static typename OP::result_type apply(base_type& img, type_id id, const OP& op) { switch (id) { case 0: return op(reinterpret_cast<gray8_image& >(img)); break; case 1: return op(reinterpret_cast<gray16_image& >(img)); break; case 2: return op(reinterpret_cast<gray32_image& >(img)); break; case 3: return op(reinterpret_cast<rgb8_image& >(img)); break; case 4: return op(reinterpret_cast<rgb16_image& >(img)); break; case 5: return op(reinterpret_cast<rgb32_image& >(img)); break; case 6: return op(reinterpret_cast<bgr8_image& >(img)); break; case 7: return op(reinterpret_cast<bgr16_image& >(img)); break; case 8: return op(reinterpret_cast<bgr32_image& >(img)); break; case 9: return op(reinterpret_cast<rgb8_planar_image& >(img)); break; case 10: return op(reinterpret_cast<rgb16_planar_image& >(img)); break; case 11: return op(reinterpret_cast<rgb32_planar_image& >(img)); break; case 12: return op(reinterpret_cast<rgba8_image& >(img)); break; case 13: return op(reinterpret_cast<rgba16_image& >(img)); break; case 14: return op(reinterpret_cast<rgba32_image& >(img)); break; case 15: return op(reinterpret_cast<rgba8_planar_image& >(img)); break; case 16: return op(reinterpret_cast<rgba16_planar_image& >(img)); break; case 17: return op(reinterpret_cast<rgba32_planar_image& >(img)); break; case 18: return op(reinterpret_cast<cmyk8_image& >(img)); break; case 19: return op(reinterpret_cast<cmyk16_image& >(img)); break; case 20: return op(reinterpret_cast<cmyk32_image& >(img)); break; case 21: return op(reinterpret_cast<cmyk8_planar_image& >(img)); break; case 22: return op(reinterpret_cast<cmyk16_planar_image& >(img)); break; case 23: return op(reinterpret_cast<cmyk32_planar_image& >(img)); break; default: throw std::bad_cast(); } } template <typename OP> static typename OP::result_type apply(const base_type& img, type_id id, const OP& op) { switch (id) { case 0: return op(reinterpret_cast<const gray8_image& >(img)); break; case 1: return op(reinterpret_cast<const gray16_image& >(img)); break; case 2: return op(reinterpret_cast<const gray32_image& >(img)); break; case 3: return op(reinterpret_cast<const rgb8_image& >(img)); break; case 4: return op(reinterpret_cast<const rgb16_image& >(img)); break; case 5: return op(reinterpret_cast<const rgb32_image& >(img)); break; case 6: return op(reinterpret_cast<const bgr8_image& >(img)); break; case 7: return op(reinterpret_cast<const bgr16_image& >(img)); break; case 8: return op(reinterpret_cast<const bgr32_image& >(img)); break; case 9: return op(reinterpret_cast<const rgb8_planar_image& >(img)); break; case 10: return op(reinterpret_cast<const rgb16_planar_image& >(img)); break; case 11: return op(reinterpret_cast<const rgb32_planar_image& >(img)); break; case 12: return op(reinterpret_cast<const rgba8_image& >(img)); break; case 13: return op(reinterpret_cast<const rgba16_image& >(img)); break; case 14: return op(reinterpret_cast<const rgba32_image& >(img)); break; case 15: return op(reinterpret_cast<const rgba8_planar_image& >(img)); break; case 16: return op(reinterpret_cast<const rgba16_planar_image& >(img)); break; case 17: return op(reinterpret_cast<const rgba32_planar_image& >(img)); break; case 18: return op(reinterpret_cast<const cmyk8_image& >(img)); break; case 19: return op(reinterpret_cast<const cmyk16_image& >(img)); break; case 20: return op(reinterpret_cast<const cmyk32_image& >(img)); break; case 21: return op(reinterpret_cast<const cmyk8_planar_image& >(img)); break; case 22: return op(reinterpret_cast<const cmyk16_planar_image& >(img)); break; case 23: return op(reinterpret_cast<const cmyk32_planar_image& >(img)); break; default: throw std::bad_cast(); } } //#endif }; typedef variant<AnyImageConceptSpace> any_image; typedef variant<AnyImageViewConceptSpace> any_view; typedef variant<AnyConstImageViewConceptSpace> any_const_view; ADOBE_GIL_NAMESPACE_END #endif |
From: Foster B. <fos...@us...> - 2006-01-06 18:35:34
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/forest_smoke In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12808/adobe/test/forest_smoke Added Files: Jamfile.v2 main.cpp Log Message: asl 1.0.12 --- NEW FILE: main.cpp --- #include <iostream> #include <limits> #include <new> #include <cassert> #include <adobe/algorithm.hpp> #include <adobe/forest.hpp> #include <boost/range.hpp> template <typename R> // R is a depth adaptor range void output(const R& f) { typedef typename boost::range_iterator<R>::type iterator; for (iterator first(boost::begin(f)), last(boost::end(f)); first != last; ++first) { for (typename iterator::difference_type i(first.depth()); i != 0; --i) { std::cout << "\t"; } if (first.edge() == adobe::forest_leading_edge) { std::cout << "<" << *first << ">" << std::endl; } else { std::cout << "</" << *first << ">" << std::endl; } } } int main() { typedef adobe::forest<std::string> forest; typedef forest::iterator iterator; std::cout << "<- default construction and insert ->" << std::endl; forest f; iterator i (f.begin()); i = adobe::trailing_of(f.insert(i, "grandmother")); { iterator p (adobe::trailing_of(f.insert(i, "mother"))); f.insert(p, "me"); f.insert(p, "sister"); f.insert(p, "brother"); } { iterator p (adobe::trailing_of(f.insert(i, "aunt"))); f.insert(p, "cousin"); } f.insert(i, "uncle"); output(adobe::depth_range(f)); std::cout << "<- copy construction and reverse ->" << std::endl; forest f2(f); iterator f2_grandmother(adobe::find(adobe::preorder_range(f2), "grandmother").base()); f2.reverse(adobe::child_begin(f2_grandmother), adobe::child_end(f2_grandmother)); output(adobe::depth_range(f2)); std::cout << "<- reverse iterator ->" << std::endl; output(adobe::depth_range(adobe::reverse_fullorder_range(f))); return 0; } --- NEW FILE: Jamfile.v2 --- # Jamfile for building the forest smoke test app project adobe/forest_smoke_test ; run main.cpp ; |