]>
granicus.if.org Git - icu/log
Jeff Genovy [Wed, 10 Apr 2019 20:37:38 +0000 (13:37 -0700)]
ICU-20536 ICU 62.2 release tasks + tzdata2019a
Jeff Genovy [Tue, 9 Apr 2019 01:36:54 +0000 (18:36 -0700)]
ICU-20536 Japanese era Reiwa support in ICU4J 62
Jeff Genovy [Mon, 8 Apr 2019 22:19:59 +0000 (15:19 -0700)]
ICU-20536 Japanese era Reiwa support in ICU4C 62
Jeff Genovy [Wed, 6 Feb 2019 04:07:27 +0000 (20:07 -0800)]
ICU-20482 Remove empty file, skip CI builds with copyright linter.
Jeff Genovy [Wed, 6 Feb 2019 02:40:57 +0000 (18:40 -0800)]
ICU-20482 Remove Travis CI Doxygen build.
Jeff Genovy [Wed, 6 Feb 2019 04:08:59 +0000 (20:08 -0800)]
ICU-20482 Remove VS 2015 build from Azure Pipelines CI config.
Jeff Genovy [Wed, 6 Feb 2019 02:13:26 +0000 (18:13 -0800)]
ICU-20482 Add Azure Pipelines CI Builds config.
Steven R. Loomis [Thu, 20 Sep 2018 21:20:32 +0000 (14:20 -0700)]
ICU-20482 Pickup fixes for copyright scanner (lint).
cherry-picked from:
f89a1d9d8a92d89cb417ae45bf7e741878cbd35c
Original commit message:
ICU-20066 add a copyright scan stage (#26)
- name the travis build steps
- copy cpyskip.txt to /.cpyskip.txt
- add one named "lint" which runs cpyscan.pl
- remove network access from Cpy.pm (requires installation)
Shane Carr [Fri, 18 Jan 2019 00:53:46 +0000 (16:53 -0800)]
ICU-20482 Pickup additional Python3 changes for depstest.py
cherry-picked from:
335abbe3ac5302b893fe65871615a58d8dc7ac9f
Original commit message:
ICU-20334 Additional python3 compatibility changes to depstest.
Also adds python3 depstest call to .travis.yml.
Luca Stefani [Fri, 4 Jan 2019 16:09:19 +0000 (17:09 +0100)]
ICU-20482 Pickup Python3 support changes.
cherry-picked from:
cc66247297986e82b8a5df90fe6ff06a948589fd
Original commit message:
ICU-20334 Add python3 support to icu4c scripts
Test: Execute every python script with python 2 and 3
Fredrik Roubert [Mon, 6 Aug 2018 12:22:35 +0000 (14:22 +0200)]
ICU-20482 Pickup Python -B change.
cherry-picked from:
12e2a72747a61190aa4998a72a7727e0595d8cc2
Original commit message:
ICU-20062 Set the Python -B flag to inhibit the writing of .pyc files.
This will prevent littering the source tree with spurious .pyc files.
The potential faster execution when re-running a script that has an
up-to-date .pyc file is negligible.
Jeff Genovy [Wed, 6 Feb 2019 00:34:34 +0000 (16:34 -0800)]
ICU-20482 Fix build breaks + regenerate ICU4J data files.
- Regenerate the ICU4J data files (icudata.jar and icutzdata.jar).
- Remove unsupported Java Diamond operators in order to unbreak the Java build.
Jeff Genovy [Tue, 5 Feb 2019 20:01:38 +0000 (12:01 -0800)]
ICU-20482 Add Appveyor CI Build config changes
(Using the file @
2e86b08fcda87e279efdcb8f9f3310cb6b9150af ).
Jeff Genovy [Tue, 5 Feb 2019 20:02:13 +0000 (12:02 -0800)]
ICU-20482 Add Travis CI Build config changes
(Using the file @
f0d3f25b0bafaf912e69713eb1c04c3fa3c9f6d3 )
Jeff Genovy [Tue, 18 Sep 2018 19:24:58 +0000 (12:24 -0700)]
ICU-20482 Pickup change to "date" sample program for testing/validation of new era.
cherry-picked from:
78ce12024b0e37539742641c9d43e5a48faa67a1
Original commit message:
ICU-20145 Allow passing locale in ICU4C "date" sample program for testing without using the environment variable "LC_ALL". (#125)
The ICU4C sample "date" program just uses the "default" ICU locale. This change lets you pass in an explicit locale argument for testing on platforms like Windows that don't have/use the environment variable "LC_ALL".
Jeff Genovy [Fri, 22 Feb 2019 05:50:38 +0000 (21:50 -0800)]
ICU-20482 Windows component version should be conditional on the new era date.
cherry-picked from:
1775e4c773244d874e93b549115250d42bb2c5a1
Jeff Genovy [Mon, 14 Jan 2019 20:12:43 +0000 (12:12 -0800)]
ICU-20482 Changes for the Windows system component version, fix Windows headers.
cherry-picked from:
8a2094d23fd6bc2fe5418ca89102cba67652d15c
Original commit message:
Changes for the Windows system component version.
Jeff Genovy [Thu, 10 Jan 2019 08:57:13 +0000 (00:57 -0800)]
ICU-20482 Pickup fixes for memory problems and dependencies issues.
cherry-picked from:
0963829d4423329a63d7771740556404e32eb0c2
Original commit message:
Selectively cherry pick memory fixes and dependencies changes from ICU 63 RC BRS tasks.
(cherry-picked from:
cc1784ae7d993618b9af57ed71cde411ebe233fa )
Jeff Genovy [Mon, 17 Sep 2018 21:33:08 +0000 (14:33 -0700)]
ICU-20482 Support for placeholder in UWP, simplify memory management, remove gotos and typos.
cherry-picked from:
3ec241f568640d107166783cc067df2bf17ba39f
Original commit message:
- Enable UWP version of ICU to use Environment variable `ICU_ENABLE_TENTATIVE_ERA` for testing placeholder era names.
- Use `LocalArray<int32_t>` for the Era Start Dates to simply memory management, so that `goto` can be removed.
- Also fix some minor typos in header file.
cherry-picked from
4a8b474e7777b962a23ab45ec459ba87c5a19e30 .
Yoshito Umaoka [Wed, 12 Sep 2018 21:13:30 +0000 (17:13 -0400)]
ICU-20482 Japanese Calendar changes to enable placeholder support for the New Era.
Manually cherry-picked from commit:
45cdda61a630fb261ae82013bd3a1b5a02ef573e
Original commit message:
ICU-12973 CLDR Japanese Era data and tentative Japanese new era support (#111)
* Updated era data format in supplementalData.
* Include tentative era names in data. Implemented Japanese era loaded from CLDR data in ICU4J.
* ICU4C implementation, ICU4C refactoring. WIP.
* VS project updates and some bug fixes
Also added API comments.
* Review feedback and bug fixes
- NULL to nullptr
- use of LocalUResourceBundlePointer
- TYPO "name" to "named"
- env var checking stricmp() == 0
* API comment correction based on feedback
* Duplicate the comment in ucal.h to calendar.h
* Fixed spelling errors in API comment
Jeff Genovy [Wed, 5 Sep 2018 21:16:01 +0000 (14:16 -0700)]
ICU-20049 Maintenance changes for ICU 62. (Merge pull request #60 from jefgen/maint/maint-62).
Porting various up-level fixes from the master branch into the ICU 62 maintenance branch.
Shane [Thu, 16 Aug 2018 02:01:10 +0000 (21:01 -0500)]
ICU-20001 Adding alignas to static-allocated memory.
Should fix possible crashes on ARM platforms. (#63)
Jeff Genovy [Wed, 15 Aug 2018 20:32:29 +0000 (13:32 -0700)]
ICU-20049 Fix readme link for Travis builds to point at the maint branch.
Markus Scherer [Sun, 24 Jun 2018 21:12:22 +0000 (21:12 +0000)]
ICU-13851 case mapping data: when fetching delta make sure to read from start of exceptional values
X-SVN-Rev: 41550
Steven R. Loomis [Wed, 18 Jul 2018 18:46:23 +0000 (11:46 -0700)]
ICU-20032 re-enable Travis (#10)
- From https://github.com/aheninger/icu-trunk-exp by @aheninger
Steven R. Loomis [Thu, 2 Aug 2018 00:56:55 +0000 (17:56 -0700)]
ICU-20033 Add a top-level README.md (#11)
* ICU-20033: add a README.md
- add a basic README.md linking to icu4c and icu4j
PR-URL: https://github.com/unicode-org/icu/pull/11
Yoshito Umaoka [Wed, 20 Jun 2018 05:34:56 +0000 (05:34 +0000)]
ICU-13823 Merged #13840 number parser memory overflow fix (r41541) to maint-62 for 62.1 GA.
X-SVN-Rev: 41542
Yoshito Umaoka [Fri, 15 Jun 2018 23:18:17 +0000 (23:18 +0000)]
ICU-13823 Merged #13835 C++17 compiler error fix (r41523) to maint-62 for 62.1 GA.
X-SVN-Rev: 41535
Yoshito Umaoka [Fri, 15 Jun 2018 23:13:43 +0000 (23:13 +0000)]
ICU-13823 Merged #13828 DecimalFormat error code handling fix (r41515) to maint-62 for 62.1 GA.
X-SVN-Rev: 41534
Yoshito Umaoka [Fri, 15 Jun 2018 23:08:21 +0000 (23:08 +0000)]
ICU-13823 Merged #13818 TokenConsumer virtual destructor (r41519) to maint-62 for 62.1 GA.
X-SVN-Rev: 41533
Yoshito Umaoka [Fri, 15 Jun 2018 23:03:33 +0000 (23:03 +0000)]
ICU-13823 Mreged #13816 ICU4C Windows build issue fix (r41504) to maint-62 for 62.1 GA.
X-SVN-Rev: 41532
Yoshito Umaoka [Fri, 15 Jun 2018 22:57:09 +0000 (22:57 +0000)]
ICU-13823 Merged #13822 remove VES from currency numeric code data (r41511) to maint-62 and regenerated ICU4J data for 62.1 GA.
X-SVN-Rev: 41531
Yoshito Umaoka [Fri, 15 Jun 2018 22:30:17 +0000 (22:30 +0000)]
ICU-13823 Merged #13826 Windows 7 default time zone detection fix (r41514) to maint-62 for 62.1 GA.
X-SVN-Rev: 41530
Yoshito Umaoka [Fri, 15 Jun 2018 21:39:10 +0000 (21:39 +0000)]
ICU-13823 Merged CLDR release-33-1-d03 updates (r41525, r41528) to maint-62 for 62.1 GA.
X-SVN-Rev: 41529
Jeff Genovy [Tue, 12 Jun 2018 20:56:33 +0000 (20:56 +0000)]
ICU-13823 Update ICU4C and ICU4J readme.html files for 62.1 GA.
X-SVN-Rev: 41517
Jeff Genovy [Tue, 12 Jun 2018 20:36:16 +0000 (20:36 +0000)]
ICU-13823 Update the ICU4J version for 62.1 GA.
X-SVN-Rev: 41516
Andy Heninger [Fri, 1 Jun 2018 01:19:38 +0000 (01:19 +0000)]
ICU-13807 ICU 62 No Data Testing fixes. Mostly to test code.
X-SVN-Rev: 41500
Shane Carr [Fri, 1 Jun 2018 01:02:49 +0000 (01:02 +0000)]
ICU-13804 Fixing memory leak from r41497.
X-SVN-Rev: 41499
Shane Carr [Fri, 1 Jun 2018 00:48:18 +0000 (00:48 +0000)]
ICU-13804 Fixing test failure from r41497.
X-SVN-Rev: 41498
Shane Carr [Fri, 1 Jun 2018 00:31:54 +0000 (00:31 +0000)]
ICU-13804 Making number parsing code more robust when given empty symbol strings.
X-SVN-Rev: 41497
Peter Edberg [Thu, 31 May 2018 23:11:53 +0000 (23:11 +0000)]
ICU-13667 ICU 62rc BRS, edit ICU4C APIChangeReport.html for scale status, group changes for (const enum&) > (enum)
X-SVN-Rev: 41496
Shane Carr [Thu, 31 May 2018 22:04:08 +0000 (22:04 +0000)]
ICU-13667 Making =delete APIdocs consistent in numberformatter.h
X-SVN-Rev: 41495
Norbert Runge [Thu, 31 May 2018 21:53:43 +0000 (21:53 +0000)]
ICU-13667 Fixes compilation errors related to UCONFIG_NO_XXX flag variations.
X-SVN-Rev: 41494
Shane Carr [Thu, 31 May 2018 21:32:35 +0000 (21:32 +0000)]
ICU-13667 Fixing incorrect version tag on scale() setter.
X-SVN-Rev: 41493
Peter Edberg [Thu, 31 May 2018 19:09:19 +0000 (19:09 +0000)]
ICU-13667 ICU 62rc BRS, edit ICU4C APIChangeReport.html to remove const>const& and =delete, add note about Rounder>Precision
X-SVN-Rev: 41492
Peter Edberg [Wed, 30 May 2018 22:45:26 +0000 (22:45 +0000)]
ICU-13667 ICU 62rc BRS, update guard conditionals for non-stable API part 2 (common,io pass 1)
X-SVN-Rev: 41491
Shane Carr [Wed, 30 May 2018 22:11:12 +0000 (22:11 +0000)]
ICU-13667 Updating APIChangeReport.html with Rounder renamed to Precision.
X-SVN-Rev: 41490
Shane Carr [Wed, 30 May 2018 21:27:07 +0000 (21:27 +0000)]
ICU-13667 Making new DecimalFormat constructor private.
X-SVN-Rev: 41489
Shane Carr [Wed, 30 May 2018 19:20:24 +0000 (19:20 +0000)]
ICU-13667 Adding unumberformatter.h to the doxygen front page
X-SVN-Rev: 41488
Markus Scherer [Wed, 30 May 2018 19:15:02 +0000 (19:15 +0000)]
ICU-13667 LocalizedNumberFormatterAsFormat is in the old Format class hierarchy, add ClassID boilerplate; NoUnit move virtual destructor up into first-virtual position, right after constructors
X-SVN-Rev: 41487
Peter Edberg [Wed, 30 May 2018 18:39:29 +0000 (18:39 +0000)]
ICU-13667 ICU 62rc BRS, update guard conditionals for non-stable API part 1 (i18n pass 1)
X-SVN-Rev: 41486
Norbert Runge [Wed, 30 May 2018 14:40:13 +0000 (14:40 +0000)]
ICU-13667 Moves digits_t, DEFAULT_THRESHOLD, and copyErrorTo() outside of U_HIDE_INTERNAL_API.
X-SVN-Rev: 41485
Peter Edberg [Wed, 30 May 2018 04:37:30 +0000 (04:37 +0000)]
ICU-13667 ICU 62rc BRS, update ICU4C APIChangeReport.html, generated from r41483
X-SVN-Rev: 41484
Shane Carr [Wed, 30 May 2018 03:34:41 +0000 (03:34 +0000)]
ICU-8610 Responding to number skeleton code review feedback.
X-SVN-Rev: 41483
Peter Edberg [Wed, 30 May 2018 03:34:29 +0000 (03:34 +0000)]
ICU-13667 ICU 62rc BRS, update urename.h
X-SVN-Rev: 41482
Peter Edberg [Wed, 30 May 2018 01:22:52 +0000 (01:22 +0000)]
ICU-13667 ICU 62rc BRS, update measurement unit constants
X-SVN-Rev: 41481
Jeff Genovy [Wed, 30 May 2018 00:49:34 +0000 (00:49 +0000)]
ICU-13667 Fix Samples test script for ucnv project.
X-SVN-Rev: 41480
Peter Edberg [Tue, 29 May 2018 22:33:10 +0000 (22:33 +0000)]
ICU-13792 Integrate data from cldr/tags/release-33-1-d02 to ICU trunk for ICU62rc
X-SVN-Rev: 41479
Yoshito Umaoka [Tue, 29 May 2018 21:26:24 +0000 (21:26 +0000)]
ICU-13667 BRS62 - Added ICU 62 serialization test data, removed ICU 57.
X-SVN-Rev: 41478
Yoshito Umaoka [Tue, 29 May 2018 21:12:48 +0000 (21:12 +0000)]
ICU-13667 BRS62 - added ICU4J 62 API signature file (and deleted ICU4J 52 API signature file).
X-SVN-Rev: 41477
Yoshito Umaoka [Tue, 29 May 2018 21:07:31 +0000 (21:07 +0000)]
ICU-13667 Updated API change report, fixed API report tool to handle 5 letter sub-package (number) properly.
X-SVN-Rev: 41476
Yoshito Umaoka [Tue, 29 May 2018 19:34:43 +0000 (19:34 +0000)]
ICU-13667 BRS62 Clean up import statements.
X-SVN-Rev: 41475
Yoshito Umaoka [Tue, 29 May 2018 17:26:56 +0000 (17:26 +0000)]
ICU-13667 Currency numeric code update for ICU 62 - added VES that will be effective on June 4.
X-SVN-Rev: 41474
Yoshito Umaoka [Tue, 29 May 2018 17:06:21 +0000 (17:06 +0000)]
ICU-13667 Fixing compiler warnings and API doc issues.
X-SVN-Rev: 41473
Jeff Genovy [Tue, 29 May 2018 01:59:42 +0000 (01:59 +0000)]
ICU-13788 Fixing issue with accidental UErrorCode conversion to UBool.
X-SVN-Rev: 41472
Jeff Genovy [Sun, 27 May 2018 03:08:42 +0000 (03:08 +0000)]
ICU-13788 Remove trailing semicolon that causes compiler warning.
X-SVN-Rev: 41471
Jeff Genovy [Sun, 27 May 2018 03:07:57 +0000 (03:07 +0000)]
ICU-13788 Fix compiler error C4251 on Windows (MSVC, Clang, MinGW).
X-SVN-Rev: 41470
Jeff Genovy [Sat, 26 May 2018 19:23:18 +0000 (19:23 +0000)]
ICU-13667 Update filters for VS project file for numberformatter.
X-SVN-Rev: 41469
Jeff Genovy [Fri, 25 May 2018 23:47:51 +0000 (23:47 +0000)]
ICU-13667 Fix discrepancy in text in 'configure'.
X-SVN-Rev: 41468
Jeff Genovy [Fri, 25 May 2018 23:39:14 +0000 (23:39 +0000)]
ICU-13667 Update ICU4J version number for 62.1 release candidate, and readme file.
X-SVN-Rev: 41467
Markus Scherer [Fri, 25 May 2018 23:39:01 +0000 (23:39 +0000)]
ICU-13630 update spoof checker inclusion/recommended sets from Unicode 9 to Unicode 11
X-SVN-Rev: 41466
Shane Carr [Fri, 25 May 2018 22:54:48 +0000 (22:54 +0000)]
ICU-13788 Fixing number_decimfmtprops C++ dependency issue.
X-SVN-Rev: 41465
Shane Carr [Fri, 25 May 2018 21:29:59 +0000 (21:29 +0000)]
ICU-13788 Fixing numparse_impl C++ dependency issues.
X-SVN-Rev: 41464
Jeff Genovy [Fri, 25 May 2018 21:29:10 +0000 (21:29 +0000)]
ICU-13667 Update ICU4C version number for 62.1 release candidate.
X-SVN-Rev: 41463
Markus Scherer [Fri, 25 May 2018 18:18:15 +0000 (18:18 +0000)]
ICU-13630 script metadata: Mongolian -> exclusion
X-SVN-Rev: 41462
Markus Scherer [Fri, 25 May 2018 17:57:30 +0000 (17:57 +0000)]
ICU-13667 update/fix/improve dependencies; better layering formatting->numberparser->numberformatter->number_representation
X-SVN-Rev: 41461
Jeff Genovy [Fri, 25 May 2018 07:27:56 +0000 (07:27 +0000)]
ICU-13775 Fix build issues on MinGW and Clang-for-Windows (with exported template instantiations).
X-SVN-Rev: 41460
Shane Carr [Fri, 25 May 2018 03:01:38 +0000 (03:01 +0000)]
ICU-13788 Minor coverity fixes for number code.
X-SVN-Rev: 41459
Shane Carr [Fri, 25 May 2018 02:27:51 +0000 (02:27 +0000)]
ICU-13788 Improving error message printing in DateFmtPerf.cpp
X-SVN-Rev: 41458
Shane Carr [Fri, 25 May 2018 00:26:00 +0000 (00:26 +0000)]
ICU-13722 Removing obsolete constructs FmtStackData and UCONFIG_FORMAT_FASTPATHS_49.
X-SVN-Rev: 41457
Shane Carr [Thu, 24 May 2018 21:28:11 +0000 (21:28 +0000)]
ICU-13677 Fixing up apidoc strings for precision setting.
X-SVN-Rev: 41456
Jeff Genovy [Thu, 24 May 2018 07:35:20 +0000 (07:35 +0000)]
ICU-13698 Add "samplecheck.bat" script, similar to "icucheck.bat" to run the ICU4C samples.
X-SVN-Rev: 41454
Jeff Genovy [Thu, 24 May 2018 05:59:09 +0000 (05:59 +0000)]
ICU-13556 Add missing order-only prerequisite in data/Makefile.in
X-SVN-Rev: 41453
Jeff Genovy [Thu, 24 May 2018 05:54:49 +0000 (05:54 +0000)]
ICU-13785 Adding dependency information to uconv project to prevent "NMAKE : fatal error U1077" on Win/VS builds.
X-SVN-Rev: 41452
Peter Edberg [Thu, 24 May 2018 05:52:01 +0000 (05:52 +0000)]
ICU-12936 Make RelativeDateTimeFormatter handle offset of -0
X-SVN-Rev: 41451
Shane Carr [Thu, 24 May 2018 04:35:16 +0000 (04:35 +0000)]
ICU-13736 Change number parsing to require locale currency when using non-currency parse function.
X-SVN-Rev: 41450
Shane Carr [Thu, 24 May 2018 04:31:06 +0000 (04:31 +0000)]
ICU-11739 Replying to Andy code review comments.
X-SVN-Rev: 41449
Shane Carr [Thu, 24 May 2018 04:26:26 +0000 (04:26 +0000)]
ICU-11645 Replying to Andy code review comments.
X-SVN-Rev: 41448
Shane Carr [Thu, 24 May 2018 04:19:28 +0000 (04:19 +0000)]
ICU-13788 Fixing small memory leak in ucurr.cpp; always register the main currency_cleanup function, not the helper functions.
X-SVN-Rev: 41447
Shane Carr [Thu, 24 May 2018 04:16:35 +0000 (04:16 +0000)]
ICU-13777 Adding tests to make sure currency long names round-trip through parsing.
X-SVN-Rev: 41446
Shane Carr [Thu, 24 May 2018 03:36:42 +0000 (03:36 +0000)]
ICU-13788 Disabling failing RBNF parse test; to be addressed in #13793
X-SVN-Rev: 41445
Peter Edberg [Thu, 24 May 2018 03:30:20 +0000 (03:30 +0000)]
ICU-13768 Update currency list for ucurr_openISOCurrencies
X-SVN-Rev: 41444
Shane Carr [Wed, 23 May 2018 21:59:30 +0000 (21:59 +0000)]
ICU-13788 Fixing data types in numparse_decimal.cpp; should fix MSVC test failure.
X-SVN-Rev: 41443
Shane Carr [Wed, 23 May 2018 21:08:53 +0000 (21:08 +0000)]
ICU-13763 Makes FieldPositionIterator offset by input string length in DecimalFormat, restoring ICU 61 behavior.
X-SVN-Rev: 41442
Shane Carr [Wed, 23 May 2018 04:34:41 +0000 (04:34 +0000)]
ICU-13717 Optimizing SimpleDateFormat's use of NumberFormat for new number formatting pipeline.
X-SVN-Rev: 41441
Shane Carr [Wed, 23 May 2018 04:21:24 +0000 (04:21 +0000)]
ICU-13717 During SimpleDateFormat#parseInt, avoid cloning the DecimalFormat unless necessary.
X-SVN-Rev: 41440
Shane Carr [Wed, 23 May 2018 04:03:19 +0000 (04:03 +0000)]
ICU-13717 Adds fast path for RBNF, which is not affect by min/max integer digits.
X-SVN-Rev: 41439
Shane Carr [Wed, 23 May 2018 02:00:03 +0000 (02:00 +0000)]
ICU-13717 Adds "fast formatters" optimization to smpdtfmt.cpp to greatly improve the performance of SimpleDateFormat with the new number formatting pipeline.
X-SVN-Rev: 41438
Shane Carr [Wed, 23 May 2018 01:18:07 +0000 (01:18 +0000)]
ICU-13717 Fixes memory leak in date format parsing by moving cloning into the parseInt function.
X-SVN-Rev: 41437
Shane Carr [Wed, 23 May 2018 01:04:17 +0000 (01:04 +0000)]
ICU-13717 Moves NumberFormat cloning into the zeroPaddingNumber method. Also indirectly fixes a memory leak from the previous commit.
X-SVN-Rev: 41436